--- a/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Tue Sep 29 11:08:37 2009 +0200
+++ b/src/FingersDance.Control.TimeLine/UserControlTimeLine.xaml	Tue Sep 29 11:49:59 2009 +0200
@@ -780,6 +780,6 @@
 	<Grid x:Name="LayoutRoot" Width="Auto" Height="Auto" Background="{x:Null}">
 		<Custom:SurfaceSlider  Height="Auto" x:Name="slider" Value="0.5" Width="Auto" 
                                Thumb.DragStarted="sliderPosition_DragStarted" Thumb.DragCompleted="sliderPosition_DragCompleted" ContactTapGesture="slider_ContactTapGesture" Background="#19FFFFFF" Style="{DynamicResource FingersDance.Control.Slider}" />
-        <vw:TimelineView x:Name="tv" Margin="0,30,0,0" Background="{x:Null}"/>
+        <vw:TimelineView x:Name="tv" Margin="0,15,0,0" Background="{x:Null}"/>
     </Grid>
 </UserControl>
\ No newline at end of file

--- a/src/FingersDance.Views/TimelineAnnotationView.xaml	Tue Sep 29 11:08:37 2009 +0200
+++ b/src/FingersDance.Views/TimelineAnnotationView.xaml	Tue Sep 29 11:49:59 2009 +0200
@@ -8,18 +8,18 @@
 	x:Class="FingersDance.Views.TimelineAnnotationView"
     xmlns:vw="clr-namespace:FingersDance.Views"
 	x:Name="UserControl"
-	d:DesignWidth="640" d:DesignHeight="480" Width="40" Loaded="UserControl_Loaded">
+	d:DesignWidth="640" d:DesignHeight="480" Width="40">
     <UserControl.Resources>
         <vw:ThicknessSingleValueConverter x:Name="myThicknessSingleValueConverter" x:Key="myThicknessSingleValueConverter"/>
         <vw:VisibilityConverter x:Name="myVisibilityConverter" x:Key="myVisibilityConverter"/>
     </UserControl.Resources>
     <Custom:SurfaceUserControl x:Name="LayoutRoot" Margin="{Binding Path=TcBegin, Converter={StaticResource myThicknessSingleValueConverter}}">
         <Grid>
-            <Ellipse Stroke="Green" Fill="{x:Null}" Margin="-3,-4,0,0" Height="8" VerticalAlignment="Top" HorizontalAlignment="Left" Width="8"/>
-            <Ellipse Fill="Green" Margin="-2,-3,0,0" Height="6" VerticalAlignment="Top" HorizontalAlignment="Left" Width="6" Visibility="{Binding Path=Dur, Converter={StaticResource myVisibilityConverter}}" />
-            <Rectangle Fill="Green" HorizontalAlignment="Left" VerticalAlignment="Top" Width="2" Height="17" Margin="0,3,0,0"/>
-            <Rectangle Fill="Green" HorizontalAlignment="Left" VerticalAlignment="Top" Width="{Binding Path=Dur}" Height="2" Margin="0,18,0,0"/>
             <TextBox HorizontalAlignment="Left" Text="{Binding Path=GestureType}" Width="40" Margin="0,20,0,0" Visibility="{Binding Path=Dur, Converter={StaticResource myVisibilityConverter}}"/>
+            <Ellipse Stroke="Green" Fill="{x:Null}" Margin="-3,16,0,0" Height="8" VerticalAlignment="Top" HorizontalAlignment="Left" Width="8"/>
+            <Ellipse Fill="Green" Margin="-2,17,0,0" Height="6" VerticalAlignment="Top" HorizontalAlignment="Left" Width="6" Visibility="{Binding Path=Dur, Converter={StaticResource myVisibilityConverter}}" />
+            <Rectangle Fill="Green" HorizontalAlignment="Left" VerticalAlignment="Top" Width="2" Height="17"/>
+            <Rectangle Fill="Green" HorizontalAlignment="Left" VerticalAlignment="Top" Width="{Binding Path=Dur}" Height="2"/>
         </Grid>
     </Custom:SurfaceUserControl>
 </UserControl>
\ No newline at end of file

--- a/src/FingersDance.Views/TimelineAnnotationView.xaml.cs	Tue Sep 29 11:08:37 2009 +0200
+++ b/src/FingersDance.Views/TimelineAnnotationView.xaml.cs	Tue Sep 29 11:49:59 2009 +0200
@@ -23,11 +23,6 @@
         {
             InitializeComponent();
         }
-
-        private void UserControl_Loaded(object sender, RoutedEventArgs e)
-        {
-
-        }
     }
 
     public class ThicknessSingleValueConverter : IValueConverter