diff -r d70ee2002f75 -r 3a407c966e57 src/FingersDance.Views/TimelineAnnotationView.xaml
--- a/src/FingersDance.Views/TimelineAnnotationView.xaml	Sun Oct 25 12:38:45 2009 +0100
+++ b/src/FingersDance.Views/TimelineAnnotationView.xaml	Sun Oct 25 12:55:07 2009 +0100
@@ -7,8 +7,8 @@
 	mc:Ignorable="d"
 	x:Class="FingersDance.Views.TimelineAnnotationView"
     xmlns:vw="clr-namespace:FingersDance.Views"
-	x:Name="UserControl"
-	d:DesignWidth="640" d:DesignHeight="480" Width="300" Height="40">
+	x:Name="myTAV"
+	d:DesignWidth="640" d:DesignHeight="480" Width="850" Height="40">
     <UserControl.Resources>
         <vw:ThicknessSingleValueConverter x:Name="myThicknessSingleValueConverter" x:Key="myThicknessSingleValueConverter"/>
         <vw:VisibilityConverter x:Name="myVisibilityConverter" x:Key="myVisibilityConverter"/>
@@ -18,10 +18,29 @@
                                >
         <Grid>
             <Rectangle Fill="Black" HorizontalAlignment="Left" VerticalAlignment="Top" Width="{Binding Path=Dur}" Height="40" Opacity="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="{Binding Path=Color, Converter={StaticResource myColorConverter}}" Fill="{x:Null}" Margin="-3,16,0,0" Height="8" VerticalAlignment="Top" HorizontalAlignment="Left" Width="8"/>
-            <Ellipse Fill="{Binding Path=Color, Converter={StaticResource myColorConverter}}" Margin="-2,17,0,0" Height="6" VerticalAlignment="Top" HorizontalAlignment="Left" Width="6" Visibility="{Binding Path=Dur, Converter={StaticResource myVisibilityConverter}}" />
-            <Rectangle Fill="{Binding Path=Color, Converter={StaticResource myColorConverter}}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="2" Height="17"/>
+            <TextBox HorizontalAlignment="Left" Text="{Binding Path=GestureType}" Width="40" Margin="0,20,0,0" Visibility="{Binding Path=Dur, Converter={StaticResource myVisibilityConverter}}">
+                <TextBox.RenderTransform>
+                    <ScaleTransform ScaleX="{Binding Path=ScaleX}"/>
+                </TextBox.RenderTransform>
+            </TextBox>
+            <Ellipse Stroke="{Binding Path=Color, Converter={StaticResource myColorConverter}}" Fill="{x:Null}" Margin="-3,16,0,0" Height="8" VerticalAlignment="Top"
+                     HorizontalAlignment="Left" Width="8" RenderTransformOrigin="0.5,0.5">
+                <Ellipse.RenderTransform>
+                    <ScaleTransform ScaleX="{Binding Path=ScaleX}"/>
+                </Ellipse.RenderTransform>
+            </Ellipse>
+            <Ellipse Fill="{Binding Path=Color, Converter={StaticResource myColorConverter}}" Margin="-2,17,0,0" Height="6" VerticalAlignment="Top" HorizontalAlignment="Left"
+                     Width="6" Visibility="{Binding Path=Dur, Converter={StaticResource myVisibilityConverter}}" RenderTransformOrigin="0.5,0.5" >
+                <Ellipse.RenderTransform>
+                    <ScaleTransform ScaleX="{Binding Path=ScaleX}"/>
+                </Ellipse.RenderTransform>
+            </Ellipse>
+            <Rectangle Fill="{Binding Path=Color, Converter={StaticResource myColorConverter}}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="2" Height="17"
+                       RenderTransformOrigin="0.5,0.5">
+                <Rectangle.RenderTransform>
+                    <ScaleTransform ScaleX="{Binding Path=ScaleX}"/>
+                </Rectangle.RenderTransform>
+            </Rectangle>
             <Rectangle Fill="{Binding Path=Color, Converter={StaticResource myColorConverter}}" HorizontalAlignment="Left" VerticalAlignment="Top" Width="{Binding Path=Dur}" Height="2"/>
         </Grid>
     </Custom:SurfaceUserControl>