diff --git a/SampleApps/Shared/MapLayers.cs b/SampleApps/Shared/MapLayers.cs
index 5564bf9f..fa37febc 100644
--- a/SampleApps/Shared/MapLayers.cs
+++ b/SampleApps/Shared/MapLayers.cs
@@ -57,15 +57,6 @@ namespace ViewModel
                     MaxZoomLevel = 17
                 }
             },
-            {
-                "Hike & Bike",
-                new MapTileLayer
-                {
-                    TileSource = new TileSource { UriFormat = "https://tiles.wmflabs.org/hikebike/{z}/{x}/{y}.png" },
-                    SourceName = "HikeBike",
-                    Description = "© [OpenStreetMap contributors](http://www.openstreetmap.org/copyright)"
-                }
-            },
             {
                 "Seamarks",
                 new MapTileLayer
@@ -135,7 +126,7 @@ namespace ViewModel
             {
                 "SevenCs ChartServer WMS",
                 new ChartServerLayer()
-            },
+            }
         };
 
         private string currentMapLayerName = "OpenStreetMap";
@@ -167,7 +158,6 @@ namespace ViewModel
             "OpenStreetMap German",
             "OpenStreetMap French",
             "OpenTopoMap",
-            "Hike & Bike",
             "TopPlusOpen WMTS",
             "TopPlusOpen WMS",
             "OpenStreetMap WMS",
@@ -195,7 +185,7 @@ namespace ViewModel
         public ChartServerLayer()
         {
             Description = "© [SevenCs GmbH](http://www.sevencs.com)";
-            ServiceUri = new Uri("https://wms.sevencs.com:9090");
+            ServiceUri = new Uri("http://wms.sevencs.com");
             Layers = "ENC";
             MaxBoundingBoxWidth = 360;
         }
diff --git a/SampleApps/UniversalApp/MainPage.xaml b/SampleApps/UniversalApp/MainPage.xaml
index 3444c2dd..4060041c 100644
--- a/SampleApps/UniversalApp/MainPage.xaml
+++ b/SampleApps/UniversalApp/MainPage.xaml
@@ -114,7 +114,9 @@
                 </map:MapPanel.BoundingBox>
             </Image>
 
-            <map:MapGraticule x:Name="mapGraticule" Opacity="0.6"/>
+            <map:MapGraticule x:Name="graticule" Opacity="0.6"
+                              Visibility="{Binding IsChecked, ElementName=graticuleCheckBox}"/>
+
             <map:MapScale HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
 
             <!-- use ItemTemplate or ItemContainerStyle alternatively -->
@@ -149,27 +151,35 @@
             </Grid.ColumnDefinitions>
             <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
                 <StackPanel Margin="5">
-                    <TextBlock Text="Zoom Level" HorizontalAlignment="Center" Foreground="Gray" FontSize="14"/>
-                    <Slider Margin="10,-10,10,-10" Width="100" SmallChange="0.1"
+                    <TextBlock Text="Zoom Level" HorizontalAlignment="Center" FontSize="12"/>
+                    <Slider Margin="10,-10,10,0" Width="100" SmallChange="0.1"
                             Minimum="{Binding MinZoomLevel, ElementName=map}"
                             Maximum="{Binding MaxZoomLevel, ElementName=map}"
                             Value="{Binding TargetZoomLevel, ElementName=map, Mode=TwoWay}"/>
                 </StackPanel>
+
                 <StackPanel Margin="5">
-                    <TextBlock Text="Heading" HorizontalAlignment="Center" Foreground="Gray" FontSize="14"/>
-                    <Slider Margin="10,-10,10,-10" Width="100" Minimum="0" Maximum="360" SmallChange="5" LargeChange="45"
+                    <TextBlock Text="Heading" HorizontalAlignment="Center" FontSize="12"/>
+                    <Slider Margin="10,-10,10,0" Width="100" Minimum="0" Maximum="360" SmallChange="5" LargeChange="45"
                             Value="{Binding Heading, ElementName=map, Mode=TwoWay}"/>
                 </StackPanel>
-                <StackPanel Margin="5">
-                    <TextBlock Text="Image Opacity" HorizontalAlignment="Center" Foreground="Gray" FontSize="14"/>
-                    <Slider Margin="10,-10,10,-10" Width="100" Value="50" ValueChanged="ImageOpacitySliderValueChanged"/>
+
+                <StackPanel Margin="5,5,25,5">
+                    <TextBlock Text="Image Opacity" HorizontalAlignment="Center" FontSize="12"/>
+                    <Slider Margin="10,-10,10,0" Width="100" Value="50" ValueChanged="ImageOpacitySliderValueChanged"/>
                 </StackPanel>
-                <CheckBox Margin="10" VerticalAlignment="Center" Content="Seamarks"
+
+                <CheckBox x:Name="graticuleCheckBox"
+                          VerticalAlignment="Center" Content="Graticule"/>
+
+                <CheckBox VerticalAlignment="Center" Content="Seamarks"
                           Checked="SeamarksChecked" Unchecked="SeamarksUnchecked"/>
-                <ComboBox Width="250" Margin="10" VerticalAlignment="Center"
+
+                <ComboBox Width="250" VerticalAlignment="Center" Margin="0,5"
                           ItemsSource="{Binding MapLayers.MapLayerNames}"
                           SelectedItem="{Binding MapLayers.CurrentMapLayerName, Mode=TwoWay}"/>
-                <ComboBox x:Name="projectionComboBox" Width="150" Margin="10" VerticalAlignment="Bottom"
+
+                <ComboBox x:Name="projectionComboBox" Width="150" VerticalAlignment="Center" Margin="5"
                           SelectedIndex="0" SelectedValuePath="Tag"
                           SelectedValue="{Binding MapProjection, ElementName=map, Mode=TwoWay}">
                     <ComboBoxItem Content="Web Mercator" Tag="{StaticResource WebMercatorProjection}"/>
diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index 779e562e..4b8d789b 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -102,6 +102,8 @@
             </Style.Triggers>
         </Style>
 
+        <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
+
         <map:WebMercatorProjection x:Key="WebMercatorProjection"/>
         <map:WorldMercatorProjection x:Key="WorldMercatorProjection"/>
         <map:EquirectangularProjection x:Key="EquirectangularProjection"/>
@@ -130,10 +132,14 @@
                  MouseMove="MapMouseMove" MouseLeave="MapMouseLeave"
                  ManipulationInertiaStarting="MapManipulationInertiaStarting">
 
-            <Image x:Name="mapImage" Source="10_535_330.jpg" Opacity="0.5" Stretch="Fill"
+            <Image Source="10_535_330.jpg" Stretch="Fill"
+                   Opacity="{Binding Value, ElementName=imageOpacitySlider}"
                    map:MapPanel.BoundingBox="53.54031,8.08594,53.74871,8.43750"/>
 
-            <map:MapGraticule x:Name="mapGraticule" Opacity="0.6"/>
+            <map:MapGraticule x:Name="graticule" Opacity="0.6"
+                Visibility="{Binding IsChecked, ElementName=graticuleCheckBox,
+                                     Converter={StaticResource BooleanToVisibilityConverter}}"/>
+
             <map:MapScale HorizontalAlignment="Left" VerticalAlignment="Bottom"/>
 
             <!-- use ItemTemplate or ItemContainerStyle alternatively -->
@@ -175,30 +181,37 @@
             <TextBlock x:Name="mouseLocation" Margin="5" VerticalAlignment="Bottom" FontFamily="Segoe UI Mono"/>
             <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
                 <StackPanel Margin="5">
-                    <TextBlock Text="Zoom Level" Margin="0,0,0,2" HorizontalAlignment="Center" Foreground="Gray" FontSize="10"/>
+                    <TextBlock Text="Zoom Level" Margin="0,0,0,2" HorizontalAlignment="Center" FontSize="10"/>
                     <Slider AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0"
-                            Width="100" VerticalAlignment="Center" SmallChange="0.01"
+                            Width="75" VerticalAlignment="Center" SmallChange="0.01"
                             Minimum="{Binding MinZoomLevel, ElementName=map}"
                             Maximum="{Binding MaxZoomLevel, ElementName=map}"
                             Value="{Binding TargetZoomLevel, ElementName=map}"/>
                 </StackPanel>
+
                 <StackPanel Margin="5">
-                    <TextBlock Text="Heading" Margin="0,0,0,2" HorizontalAlignment="Center" Foreground="Gray" FontSize="10"/>
+                    <TextBlock Text="Heading" Margin="0,0,0,2" HorizontalAlignment="Center" FontSize="10"/>
                     <Slider AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="0"
-                            Width="100" VerticalAlignment="Center" SmallChange="5" LargeChange="45"
-                            Minimum="0" Maximum="360" Value="{Binding Heading, ElementName=map}"/>
+                            Width="75" VerticalAlignment="Center" SmallChange="5" LargeChange="45"
+                            Minimum="0" Maximum="360" Value="{Binding TargetHeading, ElementName=map}"/>
                 </StackPanel>
+
                 <StackPanel Margin="5">
-                    <TextBlock Text="Image Opacity" Margin="0,0,0,2" HorizontalAlignment="Center" Foreground="Gray" FontSize="10"/>
-                    <Slider AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="1"
-                            Width="100" VerticalAlignment="Center"
-                            Minimum="0" Maximum="1" Value="{Binding Opacity, ElementName=mapImage}"/>
+                    <TextBlock Text="Image Opacity" Margin="0,0,0,2" HorizontalAlignment="Center" FontSize="10"/>
+                    <Slider x:Name="imageOpacitySlider" AutoToolTipPlacement="TopLeft" AutoToolTipPrecision="1"
+                            Width="75" VerticalAlignment="Center" Minimum="0" Maximum="1" Value="0.5"/>
                 </StackPanel>
-                <CheckBox ToolTip="Seamarks Overlay" Margin="7" VerticalAlignment="Bottom" Content="Seamarks"
+
+                <CheckBox x:Name="graticuleCheckBox" ToolTip="Graticule Overlay" Margin="8"
+                          VerticalAlignment="Bottom" Content="Graticule"/>
+
+                <CheckBox ToolTip="Seamarks Overlay" Margin="8" VerticalAlignment="Bottom" Content="Seamarks"
                           Checked="SeamarksChecked" Unchecked="SeamarksUnchecked"/>
+
                 <ComboBox ToolTip="Map Layer" Width="200" Margin="5" VerticalAlignment="Bottom"
                           ItemsSource="{Binding MapLayers.MapLayerNames}"
                           SelectedItem="{Binding MapLayers.CurrentMapLayerName}"/>
+
                 <ComboBox x:Name="projectionComboBox" ToolTip="Map Projection" Width="120" Margin="5" VerticalAlignment="Bottom"
                           SelectedValuePath="Tag" SelectedIndex="0">
                     <ComboBoxItem Content="Web Mercator" Tag="{StaticResource WebMercatorProjection}"/>
diff --git a/SampleApps/WpfApplication/MainWindow.xaml.cs b/SampleApps/WpfApplication/MainWindow.xaml.cs
index 5cbabafe..1121e45b 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml.cs
+++ b/SampleApps/WpfApplication/MainWindow.xaml.cs
@@ -109,7 +109,7 @@ namespace WpfApplication
 
         private void SeamarksChecked(object sender, RoutedEventArgs e)
         {
-            map.Children.Insert(map.Children.IndexOf(mapGraticule), ((MapViewModel)DataContext).MapLayers.SeamarksLayer);
+            map.Children.Insert(map.Children.IndexOf(graticule), ((MapViewModel)DataContext).MapLayers.SeamarksLayer);
         }
 
         private void SeamarksUnchecked(object sender, RoutedEventArgs e)