diff --git a/MapControl/Map.cs b/MapControl/Map.cs
index 65a38688..43255cb8 100644
--- a/MapControl/Map.cs
+++ b/MapControl/Map.cs
@@ -108,6 +108,18 @@ namespace MapControl
             AddVisualChild(tileContainer);
             TileLayers = new TileLayerCollection();
             SetValue(ParentMapProperty, this);
+
+            Loaded += (o, e) =>
+            {
+                if (MainTileLayer == null)
+                {
+                    MainTileLayer = new TileLayer
+                    {
+                        Description = "© {y} OpenStreetMap Contributors, CC-BY-SA",
+                        TileSource = new OpenStreetMapTileSource { UriFormat = "http://{c}.tile.openstreetmap.org/{z}/{x}/{y}.png" }
+                    };
+                }
+            };
         }
 
         /// <summary>
diff --git a/TestApplication/MainWindow.xaml b/TestApplication/MainWindow.xaml
index 14f6e66c..2d1078b1 100644
--- a/TestApplication/MainWindow.xaml
+++ b/TestApplication/MainWindow.xaml
@@ -9,20 +9,13 @@
                        Name="Seamarks" Description="© {y} OpenSeaMap Contributors, CC-BY-SA"
                        TileSource="http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png"
                        IsCached="False" MinZoomLevel="10" MaxZoomLevel="18"/>
-        <local:SampleItemCollection x:Key="SampleItems"/>
-        <local:SampleItemStyleSelector x:Key="SampleItemStyleSelector"/>
-        <Style x:Key="SamplePushpinItemStyle" TargetType="map:MapItem">
-            <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>
-            <Setter Property="HorizontalAlignment" Value="Left"/>
-            <Setter Property="VerticalAlignment" Value="Bottom"/>
-            <Setter Property="Content" Value="{Binding Name}"/>
-            <Style.Triggers>
-                <Trigger Property="IsSelected" Value="True">
-                    <Setter Property="Foreground" Value="OrangeRed"/>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
-        <Style x:Key="SamplePointItemStyle" TargetType="map:MapItem">
+        <local:SampleItemCollection x:Key="Polylines"/>
+        <local:SampleItemCollection x:Key="Points"/>
+        <local:SampleItemCollection x:Key="Pushpins"/>
+        <DataTemplate x:Key="PolylineItemTemplate">
+            <map:MapPolyline Locations="{Binding Locations}" Stroke="Red" StrokeThickness="3"/>
+        </DataTemplate>
+        <Style x:Key="PointItemStyle" TargetType="map:MapItem">
             <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>
             <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="VerticalAlignment" Value="Bottom"/>
@@ -62,7 +55,7 @@
                                 </Path.Data>
                             </Path>
                             <Grid Canvas.Left="10" Canvas.Bottom="3">
-                                <Rectangle Name="labelBackground" Fill="White" Opacity="0.5"/>
+                                <Rectangle Name="labelBackground" Fill="White" Opacity="0.7"/>
                                 <TextBlock Margin="2,0,2,1" Text="{Binding Name}"/>
                             </Grid>
                         </Canvas>
@@ -70,76 +63,22 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <Style x:Key="SampleShapeItemStyle" TargetType="map:MapItem">
+        <Style x:Key="PushpinItemStyle" TargetType="map:MapItem">
             <Setter Property="map:MapPanel.Location" Value="{Binding Location}"/>
             <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="VerticalAlignment" Value="Bottom"/>
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="map:MapItem">
-                        <Canvas>
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal"/>
-                                    <VisualState x:Name="Disabled"/>
-                                    <VisualState x:Name="MouseOver">
-                                        <Storyboard>
-                                            <DoubleAnimation Storyboard.TargetName="labelBackground" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.1"/>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                                <VisualStateGroup x:Name="SelectionStates">
-                                    <VisualState x:Name="Unselected"/>
-                                    <VisualState x:Name="Selected"/>
-                                </VisualStateGroup>
-                                <VisualStateGroup x:Name="CurrentStates">
-                                    <VisualState x:Name="NotCurrent"/>
-                                    <VisualState x:Name="Current">
-                                        <Storyboard>
-                                            <ColorAnimation Storyboard.TargetName="path" Storyboard.TargetProperty="Stroke.Color" To="Magenta" Duration="0:0:0.1"/>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                            <Path Name="path" StrokeThickness="2" Fill="#50FFA500">
-                                <Path.RenderTransform>
-                                    <RotateTransform Angle="{Binding Rotation}"/>
-                                </Path.RenderTransform>
-                                <Path.Stroke>
-                                    <SolidColorBrush Color="Gray"/>
-                                </Path.Stroke>
-                                <Path.Data>
-                                    <EllipseGeometry RadiusX="{Binding RadiusX}" RadiusY="{Binding RadiusY}"
-                                                     Transform="{Binding ScaleRotateTransform, ElementName=map}"/>
-                                </Path.Data>
-                            </Path>
-                            <Line Stroke="Gray" StrokeThickness="4" StrokeStartLineCap="Round" StrokeEndLineCap="Round"/>
-                            <Grid Canvas.Left="3" Canvas.Bottom="3">
-                                <Rectangle Name="labelBackground" Fill="White" Opacity="0.5"/>
-                                <TextBlock Margin="2,0,2,1" Text="{Binding Name}"/>
-                            </Grid>
-                        </Canvas>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="SamplePolylineItemStyle" TargetType="map:MapItem">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="map:MapItem">
-                        <map:MapPolyline Stroke="Blue" StrokeThickness="2" Locations="{Binding Locations}"/>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="SamplePolygonItemStyle" TargetType="map:MapItem">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="map:MapItem">
-                        <map:MapPolygon Stroke="Green" StrokeThickness="2" Locations="{Binding Locations}"/>
+                    <ControlTemplate>
+                        <map:Pushpin Content="{Binding Name}"/>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="Foreground" Value="OrangeRed"/>
+                </Trigger>
+            </Style.Triggers>
         </Style>
     </Window.Resources>
     <Grid>
@@ -154,10 +93,15 @@
                  ManipulationInertiaStarting="MapManipulationInertiaStarting"
                  MouseMove="MapMouseMove" MouseLeave="MapMouseLeave">
             <map:MapGraticule Opacity="0.6"/>
-            <map:MapItemsControl ItemsSource="{StaticResource SampleItems}"
-                                 ItemContainerStyleSelector="{StaticResource SampleItemStyleSelector}"
+            <map:MapItemsControl ItemsSource="{StaticResource Polylines}"
+                                 ItemTemplate="{StaticResource PolylineItemTemplate}"/>
+            <map:MapItemsControl ItemsSource="{StaticResource Points}"
+                                 ItemContainerStyle="{StaticResource PointItemStyle}"
                                  IsSynchronizedWithCurrentItem="True"/>
-            <map:Pushpin Location="53.5,8.25" Content="N 53° 30' E 8° 15'"/>
+            <map:MapItemsControl ItemsSource="{StaticResource Pushpins}"
+                                 ItemContainerStyle="{StaticResource PushpinItemStyle}"
+                                 IsSynchronizedWithCurrentItem="True"/>
+            <map:Pushpin Location="53.5,8.2" Background="Yellow" Foreground="Blue">N 53° 30' E 8° 12'</map:Pushpin>
             <TextBlock HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="2,0,0,0" FontSize="10"
                        Text="{Binding ElementName=map, Path=MainTileLayer.Description}"/>
         </map:Map>
diff --git a/TestApplication/MainWindow.xaml.cs b/TestApplication/MainWindow.xaml.cs
index d87c4c76..0733b060 100644
--- a/TestApplication/MainWindow.xaml.cs
+++ b/TestApplication/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -14,87 +15,80 @@ namespace MapControlTestApp
         {
             InitializeComponent();
 
-            SampleItemCollection items = (SampleItemCollection)Resources["SampleItems"];
-            items.Add(
+            ICollection<object> polylines = (ICollection<object>)Resources["Polylines"];
+            polylines.Add(
                 new SamplePolyline
                 {
-                    Name = "WHV - Eckwarderhörne",
                     Locations = LocationCollection.Parse("53.5140,8.1451 53.5123,8.1506 53.5156,8.1623 53.5276,8.1757 53.5491,8.1852 53.5495,8.1877 53.5426,8.1993 53.5184,8.2219 53.5182,8.2386 53.5195,8.2387")
                 });
-            items.Add(
-                new SamplePolygon
+            polylines.Add(
+                new SamplePolyline
                 {
-                    Name = "JadeWeserPort",
-                    Locations = LocationCollection.Parse("53.5978,8.1212 53.6018,8.1494 53.5859,8.1554 53.5852,8.1531 53.5841,8.1539 53.5802,8.1392 53.5826,8.1309 53.5867,8.1317")
+                    Locations = LocationCollection.Parse("53.5978,8.1212 53.6018,8.1494 53.5859,8.1554 53.5852,8.1531 53.5841,8.1539 53.5802,8.1392 53.5826,8.1309 53.5867,8.1317 53.5978,8.1212")
                 });
-            items.Add(
-                new SamplePushpin
-                {
-                    Name = "WHV - Eckwarderhörne",
-                    Location = new Location(53.5495, 8.1877)
-                });
-            items.Add(
-                new SamplePushpin
-                {
-                    Name = "JadeWeserPort",
-                    Location = new Location(53.5914, 8.14)
-                });
-            items.Add(
-                new SamplePushpin
-                {
-                    Name = "Kurhaus Dangast",
-                    Location = new Location(53.447, 8.1114)
-                });
-            items.Add(
-                new SamplePushpin
-                {
-                    Name = "Eckwarderhörne",
-                    Location = new Location(53.5207, 8.2323)
-                });
-            items.Add(
+
+            ICollection<object> points = (ICollection<object>)Resources["Points"];
+            points.Add(
                 new SamplePoint
                 {
                     Name = "Steinbake Leitdamm",
                     Location = new Location(53.51217, 8.16603)
                 });
-            items.Add(
+            points.Add(
                 new SamplePoint
                 {
                     Name = "Buhne 2",
                     Location = new Location(53.50926, 8.15815)
                 });
-            items.Add(
+            points.Add(
                 new SamplePoint
                 {
                     Name = "Buhne 4",
                     Location = new Location(53.50468, 8.15343)
                 });
-            items.Add(
+            points.Add(
                 new SamplePoint
                 {
                     Name = "Buhne 6",
                     Location = new Location(53.50092, 8.15267)
                 });
-            items.Add(
+            points.Add(
                 new SamplePoint
                 {
                     Name = "Buhne 8",
                     Location = new Location(53.49871, 8.15321)
                 });
-            items.Add(
+            points.Add(
                 new SamplePoint
                 {
                     Name = "Buhne 10",
                     Location = new Location(53.49350, 8.15563)
                 });
-            items.Add(
-                new SampleShape
+
+            ICollection<object> pushpins = (ICollection<object>)Resources["Pushpins"];
+            pushpins.Add(
+                new SamplePoint
                 {
-                    Name = "N 53° 30' E 8° 12'",
-                    Location = new Location(53.5, 8.2),
-                    RadiusX = 200d, // meters
-                    RadiusY = 300d, // meters
-                    Rotation = 30d
+                    Name = "WHV - Eckwarderhörne",
+                    Location = new Location(53.5495, 8.1877)
+                });
+            pushpins.Add(
+                new SamplePoint
+                {
+                    Name = "JadeWeserPort",
+                    Location = new Location(53.5914, 8.14)
+                });
+            pushpins.Add(
+                new SamplePoint
+                {
+                    Name = "Kurhaus Dangast",
+                    Location = new Location(53.447, 8.1114)
+                });
+            pushpins.Add(
+                new SamplePoint
+                {
+                    Name = "Eckwarderhörne",
+                    Location = new Location(53.5207, 8.2323)
                 });
         }
 
diff --git a/TestApplication/SampleItems.cs b/TestApplication/SampleItems.cs
index acf41317..3193109d 100644
--- a/TestApplication/SampleItems.cs
+++ b/TestApplication/SampleItems.cs
@@ -1,71 +1,20 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Windows;
-using System.Windows.Controls;
+using System.Collections.ObjectModel;
 using MapControl;
 
 namespace MapControlTestApp
 {
-    class SampleItem
+    class SamplePoint
     {
         public string Name { get; set; }
-    }
-
-    class SamplePoint : SampleItem
-    {
         public Location Location { get; set; }
     }
 
-    class SamplePushpin : SamplePoint
-    {
-    }
-
-    class SampleShape : SamplePoint
-    {
-        public double RadiusX { get; set; }
-        public double RadiusY { get; set; }
-        public double Rotation { get; set; }
-    }
-
-    class SamplePolyline : SampleItem
+    class SamplePolyline
     {
         public LocationCollection Locations { get; set; }
     }
 
-    class SamplePolygon : SampleItem
+    class SampleItemCollection : ObservableCollection<object>
     {
-        public LocationCollection Locations { get; set; }
-    }
-
-    class SampleItemCollection : ObservableCollection<SampleItem>
-    {
-    }
-
-    class SampleItemStyleSelector : StyleSelector
-    {
-        public override Style SelectStyle(object item, DependencyObject container)
-        {
-            if (item is SamplePolyline)
-            {
-                return Application.Current.Windows[0].Resources["SamplePolylineItemStyle"] as Style;
-            }
-
-            if (item is SamplePolygon)
-            {
-                return Application.Current.Windows[0].Resources["SamplePolygonItemStyle"] as Style;
-            }
-
-            if (item is SampleShape)
-            {
-                return Application.Current.Windows[0].Resources["SampleShapeItemStyle"] as Style;
-            }
-
-            if (item is SamplePushpin)
-            {
-                return Application.Current.Windows[0].Resources["SamplePushpinItemStyle"] as Style;
-            }
-
-            return Application.Current.Windows[0].Resources["SamplePointItemStyle"] as Style;
-        }
     }
 }