diff --git a/08-TabbedNavigation/ReadMe.md b/08-TabbedNavigation/ReadMe.md
index feb8b021..14a97da2 100644
--- a/08-TabbedNavigation/ReadMe.md
+++ b/08-TabbedNavigation/ReadMe.md
@@ -1,7 +1,10 @@
 # Tabbed Navigation
 
-TODO
+[Tabbed Page Docs](https://prismlibrary.github.io/docs/xamarin-forms/navigation/working-with-tabbedpages.html)
 
-- Show Creating a Tabbed Page with tabs via querystring
-- Show Selecting the visible tab via querystring
-- Show Changing Tabs
\ No newline at end of file
+## This example shows the following
+
+- Creating a tab page in xaml and navigating to a tab with the query string
+- Create tabs at runtime with the query string
+- Navigating to a tab via the query string
+- Changing to another tab with the navigation service
\ No newline at end of file
diff --git a/08-TabbedNavigation/src/PrismSample.Android/MainApplication.cs b/08-TabbedNavigation/src/PrismSample.Android/MainApplication.cs
index f5bb0e3c..ac632feb 100644
--- a/08-TabbedNavigation/src/PrismSample.Android/MainApplication.cs
+++ b/08-TabbedNavigation/src/PrismSample.Android/MainApplication.cs
@@ -5,7 +5,7 @@
 namespace PrismSample.Droid
 {
     [Application(
-        Label = "Prism Sample",
+        Label = "Tabbed Navigation",
         Icon = "@mipmap/icon"
         )]
     public class MainApplication : Application
diff --git a/08-TabbedNavigation/src/PrismSample.Android/PrismSample.Android.csproj b/08-TabbedNavigation/src/PrismSample.Android/PrismSample.Android.csproj
index 4a639f88..357d9996 100644
--- a/08-TabbedNavigation/src/PrismSample.Android/PrismSample.Android.csproj
+++ b/08-TabbedNavigation/src/PrismSample.Android/PrismSample.Android.csproj
@@ -104,4 +104,9 @@
     <AndroidResource Include="Resources\drawable\splash_screen.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties XamarinHotReloadXFormsNugetUpgradeInfoBarPrismSampleAndroidHideInfoBar="True" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/08-TabbedNavigation/src/PrismSample.UWP/PrismSample.UWP.csproj b/08-TabbedNavigation/src/PrismSample.UWP/PrismSample.UWP.csproj
index f48fe555..41e1dd61 100644
--- a/08-TabbedNavigation/src/PrismSample.UWP/PrismSample.UWP.csproj
+++ b/08-TabbedNavigation/src/PrismSample.UWP/PrismSample.UWP.csproj
@@ -159,4 +159,9 @@
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties XamarinHotReloadXFormsNugetUpgradeInfoBarPrismSampleUWPHideInfoBar="True" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/08-TabbedNavigation/src/PrismSample/App.xaml b/08-TabbedNavigation/src/PrismSample/App.xaml
index ae4f0756..0535b093 100644
--- a/08-TabbedNavigation/src/PrismSample/App.xaml
+++ b/08-TabbedNavigation/src/PrismSample/App.xaml
@@ -11,7 +11,7 @@
         <Color x:Key="AccentColor">#00A5F2</Color>
         <Color x:Key="TextColor">White</Color>
 
-        <Style TargetType="TabbedPage">
+        <Style TargetType="TabbedPage"  ApplyToDerivedTypes="True">
             <Setter Property="BarBackgroundColor" Value="{StaticResource PrimaryColor}" />
             <Setter Property="BarTextColor" Value="{StaticResource TextColor}" />
             <Setter Property="SelectedTabColor" Value="{StaticResource AccentColor}" />
diff --git a/08-TabbedNavigation/src/PrismSample/App.xaml.cs b/08-TabbedNavigation/src/PrismSample/App.xaml.cs
index 779b33ff..2fb179af 100644
--- a/08-TabbedNavigation/src/PrismSample/App.xaml.cs
+++ b/08-TabbedNavigation/src/PrismSample/App.xaml.cs
@@ -27,7 +27,14 @@ protected override async void OnInitialized()
         protected override void RegisterTypes(IContainerRegistry containerRegistry)
         {
             containerRegistry.RegisterForNavigation<NavigationPage>();
+            containerRegistry.RegisterForNavigation<TabbedPage>();
+
             containerRegistry.RegisterForNavigation<MainPage, MainPageViewModel>();
+            containerRegistry.RegisterForNavigation<TabsPage, TabsPageViewModel>();
+
+            containerRegistry.RegisterForNavigation<TabAPage, TabAPageViewModel>();
+            containerRegistry.RegisterForNavigation<TabBPage, TabBPageViewModel>();
+            containerRegistry.RegisterForNavigation<TabCPage, TabCPageViewModel>();
         }
     }
 }
diff --git a/08-TabbedNavigation/src/PrismSample/ViewModels/MainPageViewModel.cs b/08-TabbedNavigation/src/PrismSample/ViewModels/MainPageViewModel.cs
index e032cca0..67db6c2d 100644
--- a/08-TabbedNavigation/src/PrismSample/ViewModels/MainPageViewModel.cs
+++ b/08-TabbedNavigation/src/PrismSample/ViewModels/MainPageViewModel.cs
@@ -1,11 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Prism.Commands;
 using Prism.Mvvm;
+using Prism.Navigation;
 
 namespace PrismSample.ViewModels
 {
     public class MainPageViewModel : BindableBase
     {
+        private INavigationService _navigationService { get; }
+
+        public MainPageViewModel(INavigationService navigationService)
+        {
+            _navigationService = navigationService;
+            
+            // Creating a shortcut for the CreateTab constant
+            const string selectedTab = KnownNavigationParameters.SelectedTab;
+
+            //Navigating to and selecting the TabA with the created parameter
+            _navigationService.NavigateAsync("TabsPage?" + $"?{selectedTab}=TabAPage");
+        }
     }
 }
diff --git a/08-TabbedNavigation/src/PrismSample/ViewModels/TabAPageViewModel.cs b/08-TabbedNavigation/src/PrismSample/ViewModels/TabAPageViewModel.cs
new file mode 100644
index 00000000..ac16ac10
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/ViewModels/TabAPageViewModel.cs
@@ -0,0 +1,12 @@
+using Prism.Navigation;
+
+namespace PrismSample.ViewModels
+{
+    public class TabAPageViewModel : TabPageViewModelBase
+    {
+        public TabAPageViewModel(INavigationService navigationService) : base(navigationService)
+        {
+            Title = "A";
+        }
+    }
+}
diff --git a/08-TabbedNavigation/src/PrismSample/ViewModels/TabBPageViewModel.cs b/08-TabbedNavigation/src/PrismSample/ViewModels/TabBPageViewModel.cs
new file mode 100644
index 00000000..1e77910f
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/ViewModels/TabBPageViewModel.cs
@@ -0,0 +1,12 @@
+using Prism.Navigation;
+
+namespace PrismSample.ViewModels
+{
+    public class TabBPageViewModel : TabPageViewModelBase
+    {
+        public TabBPageViewModel(INavigationService navigationService) : base(navigationService)
+        {
+            Title = "B";
+        }
+    }
+}
diff --git a/08-TabbedNavigation/src/PrismSample/ViewModels/TabCPageViewModel.cs b/08-TabbedNavigation/src/PrismSample/ViewModels/TabCPageViewModel.cs
new file mode 100644
index 00000000..28a9cd26
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/ViewModels/TabCPageViewModel.cs
@@ -0,0 +1,24 @@
+using Prism.Commands;
+using Prism.Navigation;
+using Prism.Navigation.TabbedPages;
+
+namespace PrismSample.ViewModels
+{
+    public class TabCPageViewModel : TabPageViewModelBase
+    {
+        private INavigationService _navigationService;
+        public DelegateCommand NavigateTabACommand { get; set; }
+
+        public TabCPageViewModel(INavigationService navigationService) : base(navigationService)
+        {
+            _navigationService = navigationService;
+            NavigateTabACommand = new DelegateCommand(NavigateTabA);
+            Title = "C";
+        }
+
+        private async void NavigateTabA()
+        {
+            await _navigationService.SelectTabAsync("TabAPage");
+        }
+    }
+}
diff --git a/08-TabbedNavigation/src/PrismSample/ViewModels/TabPageViewModelBase.cs b/08-TabbedNavigation/src/PrismSample/ViewModels/TabPageViewModelBase.cs
new file mode 100644
index 00000000..c052d6d1
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/ViewModels/TabPageViewModelBase.cs
@@ -0,0 +1,58 @@
+using Prism.Mvvm;
+using System;
+using Prism;
+using Prism.Navigation;
+
+namespace PrismSample.ViewModels
+{
+    public class TabPageViewModelBase : BindableBase, IActiveAware, IInitialize
+    {
+        private readonly INavigationService _navigationService;
+
+        private string _title;
+        public string Title
+        {
+            get => _title;
+            set => SetProperty(ref _title, value);
+        }
+
+        private bool _isActive;
+        public bool IsActive
+        {
+            get => _isActive;
+            set => SetProperty(ref _isActive, value, RaiseIsActiveChanged);
+        }
+
+        private int _activeCount;
+        public int ActiveCount
+        {
+            get => _activeCount;
+            set => SetProperty(ref _activeCount, value);
+        }
+
+        public event EventHandler IsActiveChanged;
+
+        public TabPageViewModelBase(INavigationService navigationService)
+        {
+            _navigationService = navigationService;
+        }
+
+        public void Initialize(INavigationParameters parameters)
+        {
+            if (parameters.ContainsKey("ActiveCount"))
+            {
+                ActiveCount = parameters.GetValue<int>("ActiveCount");
+            }
+        }
+
+        private void RaiseIsActiveChanged()
+        {
+            IsActiveChanged?.Invoke(this, EventArgs.Empty);
+
+            if (IsActive)
+            {
+                ActiveCount++;
+            }
+        }
+    }
+}
diff --git a/08-TabbedNavigation/src/PrismSample/ViewModels/TabsPageViewModel.cs b/08-TabbedNavigation/src/PrismSample/ViewModels/TabsPageViewModel.cs
new file mode 100644
index 00000000..60cf53f4
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/ViewModels/TabsPageViewModel.cs
@@ -0,0 +1,16 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace PrismSample.ViewModels
+{
+    public class TabsPageViewModel : BindableBase
+    {
+        public TabsPageViewModel()
+        {
+
+        }
+    }
+}
diff --git a/08-TabbedNavigation/src/PrismSample/Views/MainPage.xaml b/08-TabbedNavigation/src/PrismSample/Views/MainPage.xaml
index 46714de5..3318254b 100644
--- a/08-TabbedNavigation/src/PrismSample/Views/MainPage.xaml
+++ b/08-TabbedNavigation/src/PrismSample/Views/MainPage.xaml
@@ -3,14 +3,15 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:d="http://xamarin.com/schemas/2014/forms/design"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:prism="http://prismlibrary.com"
+             xmlns:viewModels="clr-namespace:PrismSample.ViewModels;assembly=PrismSample"
              mc:Ignorable="d"
-             Title="Main Page"
-             x:Class="PrismSample.Views.MainPage">
+             x:Class="PrismSample.Views.MainPage"
+             prism:ViewModelLocator.AutowireViewModel="True"
+             Title="Main Page">
 
-    <StackLayout>
-        <Label Text="Welcome to Xamarin.Forms!" 
-           HorizontalOptions="Center"
-           VerticalOptions="CenterAndExpand" />
-    </StackLayout>
+  <StackLayout VerticalOptions="CenterAndExpand">
+
+  </StackLayout>
 
 </ContentPage>
diff --git a/08-TabbedNavigation/src/PrismSample/Views/TabAPage.xaml b/08-TabbedNavigation/src/PrismSample/Views/TabAPage.xaml
new file mode 100644
index 00000000..2b44ab6c
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/Views/TabAPage.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:prism="http://prismlibrary.com"
+             x:Class="PrismSample.Views.TabAPage"
+             prism:ViewModelLocator.AutowireViewModel="True"
+             Title="Tab A">
+
+  <StackLayout VerticalOptions="CenterAndExpand">
+    <Label Text="{Binding ActiveCount, StringFormat='Number of times this tab has been activated : {0}'}" HorizontalTextAlignment="Center" />
+    <Label Text="{Binding Title, StringFormat='Tab {0} Content'}" HorizontalTextAlignment="Center" />
+  </StackLayout>
+
+</ContentPage>
\ No newline at end of file
diff --git a/08-TabbedNavigation/src/PrismSample/Views/TabAPage.xaml.cs b/08-TabbedNavigation/src/PrismSample/Views/TabAPage.xaml.cs
new file mode 100644
index 00000000..3e43a1a2
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/Views/TabAPage.xaml.cs
@@ -0,0 +1,12 @@
+using Xamarin.Forms;
+
+namespace PrismSample.Views
+{
+    public partial class TabAPage : ContentPage
+    {
+        public TabAPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/08-TabbedNavigation/src/PrismSample/Views/TabBPage.xaml b/08-TabbedNavigation/src/PrismSample/Views/TabBPage.xaml
new file mode 100644
index 00000000..342e83ed
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/Views/TabBPage.xaml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:prism="http://prismlibrary.com"
+             x:Class="PrismSample.Views.TabBPage"
+             prism:ViewModelLocator.AutowireViewModel="True"
+             Title="Tab B">
+
+  <StackLayout VerticalOptions="CenterAndExpand">
+    <Label Text="{Binding Title, StringFormat='Tab {0} Content'}" HorizontalTextAlignment="Center" />
+  </StackLayout>
+
+</ContentPage>
\ No newline at end of file
diff --git a/08-TabbedNavigation/src/PrismSample/Views/TabBPage.xaml.cs b/08-TabbedNavigation/src/PrismSample/Views/TabBPage.xaml.cs
new file mode 100644
index 00000000..66ee4da6
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/Views/TabBPage.xaml.cs
@@ -0,0 +1,12 @@
+using Xamarin.Forms;
+
+namespace PrismSample.Views
+{
+    public partial class TabBPage : ContentPage
+    {
+        public TabBPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/08-TabbedNavigation/src/PrismSample/Views/TabCPage.xaml b/08-TabbedNavigation/src/PrismSample/Views/TabCPage.xaml
new file mode 100644
index 00000000..64a4c3d4
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/Views/TabCPage.xaml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:prism="http://prismlibrary.com"
+             x:Class="PrismSample.Views.TabCPage"
+             prism:ViewModelLocator.AutowireViewModel="True"
+             Title="Tab C">
+
+  <StackLayout VerticalOptions="CenterAndExpand">
+    <Label Text="{Binding Title, StringFormat='Tab {0} Content'}" HorizontalTextAlignment="Center" />
+    <Button Text="Go To Tab A" HorizontalOptions="CenterAndExpand" Command="{Binding NavigateTabACommand}" />
+  </StackLayout>
+
+</ContentPage>
\ No newline at end of file
diff --git a/08-TabbedNavigation/src/PrismSample/Views/TabCPage.xaml.cs b/08-TabbedNavigation/src/PrismSample/Views/TabCPage.xaml.cs
new file mode 100644
index 00000000..c419c2f0
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/Views/TabCPage.xaml.cs
@@ -0,0 +1,12 @@
+using Xamarin.Forms;
+
+namespace PrismSample.Views
+{
+    public partial class TabCPage : ContentPage
+    {
+        public TabCPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/08-TabbedNavigation/src/PrismSample/Views/TabsPage.xaml b/08-TabbedNavigation/src/PrismSample/Views/TabsPage.xaml
new file mode 100644
index 00000000..fd6660a3
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/Views/TabsPage.xaml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<TabbedPage xmlns="http://xamarin.com/schemas/2014/forms"
+            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+            xmlns:prism="http://prismlibrary.com"
+            xmlns:views="clr-namespace:PrismSample.Views;assembly=PrismSample"
+            x:Class="PrismSample.Views.TabsPage"
+            prism:ViewModelLocator.AutowireViewModel="True">
+  
+  <TabbedPage.Children>
+    <views:TabAPage Title="{Binding Title}" />
+    <views:TabBPage Title="{Binding Title}" />
+    <views:TabCPage Title="{Binding Title}" />
+  </TabbedPage.Children>
+
+</TabbedPage>
\ No newline at end of file
diff --git a/08-TabbedNavigation/src/PrismSample/Views/TabsPage.xaml.cs b/08-TabbedNavigation/src/PrismSample/Views/TabsPage.xaml.cs
new file mode 100644
index 00000000..5b4e8560
--- /dev/null
+++ b/08-TabbedNavigation/src/PrismSample/Views/TabsPage.xaml.cs
@@ -0,0 +1,12 @@
+using Xamarin.Forms;
+
+namespace PrismSample.Views
+{
+    public partial class TabsPage : TabbedPage
+    {
+        public TabsPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/README.md b/README.md
index 4119220e..d36261a4 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Learn feature by feature how to use Prism in your apps!
 | 6 | [Page Dialog Service][PageDialogServiceSample] | How to use the IPageDialogService to display alerts and action sheets from within your ViewModels. |
 | 7 | [Dialog Service][DialogServiceSample] | How to use the DialogService to provide highly customizable experiences within your application. |
 | 8 | [Tabbed Navigation][8] | coming soon |
-| 9 | [Master Detail][9] | coming soon |
+| 9 | [Master Detail][MasterDetailSample] | How to use a master detail page with a content page and a tabbed page as children |
 | 10 | [Modules][ModulesSample] | How to use Prism modularization to separate the application logic using IModule, IModuleManager, ModuleCatalog. |
 | 11 | [Module Dependency][ModuleDependencySample] | coming soon |
 | 12 | [ViewModelLocator][ViewModelLocatorSample] | coming soon |
@@ -67,7 +67,7 @@ If you're adding a brand new sample be sure to start with a copy of the resource
 [PageDialogServiceSample]: 06-PageDialogService/
 [DialogServiceSample]: 07-DialogService/
 [8]: 08-TabbedNavigation/
-[9]: 09-MasterDetail/
+[MasterDetailSample]: 09-MasterDetail/
 [ModulesSample]: 10-Modules/
 [ModuleDependencySample]: 11-ModuleDependency/
 [ViewModelLocatorSample]: 12-ViewModelLocator/
@@ -80,12 +80,12 @@ If you're adding a brand new sample be sure to start with a copy of the resource
 [NavigationModeSample]: 19-NavigationMode/
 [ConfirmNavigationSample]: 20-ConfirmNavigation/
 
-[PopupsPluginSample]: 50-PopupsPlugin/
-[AppCenterLoggingSample]: 51-Logging-AppCenter/
-[SyslogLoggingSample]: 52-Logging-Syslog/
-[LogglyLoggingSample]: 53-Logging-Loggly/
-[ShinyPrismSample]: 60-ShinyLib/
-[ReactiveUISample]: 61-ReactiveUI/
+[PopupsPluginSample]: advanced-topics/PopupsPlugin/
+[AppCenterLoggingSample]: advanced-topics/Logging-AppCenter/
+[SyslogLoggingSample]: advanced-topics/Logging-Syslog/
+[LogglyLoggingSample]: advanced-topics/Logging-Loggly/
+[ShinyPrismSample]: advanced-topics/ShinyLib/
+[ReactiveUISample]: advanced-topics/ReactiveUI/
 
-[PrismFormsGallery]: 98-PrismFormsGallery
-[ContosoCookbook]: 99-ContosoCookbook
+[PrismFormsGallery]: sample-apps/PrismFormsGallery
+[ContosoCookbook]: sample-apps/ContosoCookbook