diff -r 09c4d30fe8d1 -r 574041f3b2c9 src/FingersDance.Control.Menu/UserControlMenu.xaml
--- a/src/FingersDance.Control.Menu/UserControlMenu.xaml	Thu Nov 19 09:28:15 2009 +0100
+++ b/src/FingersDance.Control.Menu/UserControlMenu.xaml	Thu Nov 19 09:29:15 2009 +0100
@@ -154,7 +154,7 @@
                     <Setter Property="BorderThickness" Value="1,1,1,1"/>
                     <Setter Property="HorizontalContentAlignment" Value="Left"/>
                     <Setter Property="VerticalContentAlignment" Value="Center"/>
-                    <Setter Property="Padding" Value="30,6,15,6"/>
+                    <Setter Property="Padding" Value="15,6,15,6"/>
                     <Setter Property="IsTabStop" Value="False"/>
                     <Setter Property="Focusable" Value="False"/>
                     <Setter Property="MinWidth" Value="30"/>
@@ -268,7 +268,7 @@
                     <Setter Property="BorderThickness" Value="1,1,1,1"/>
                     <Setter Property="HorizontalContentAlignment" Value="Left"/>
                     <Setter Property="VerticalContentAlignment" Value="Center"/>
-                    <Setter Property="Padding" Value="45,6,15,6"/>
+                    <Setter Property="Padding" Value="15,6,15,6"/>
                     <Setter Property="IsTabStop" Value="False"/>
                     <Setter Property="Focusable" Value="False"/>
                     <Setter Property="MinWidth" Value="30"/>
@@ -382,7 +382,7 @@
                     <Setter Property="BorderThickness" Value="1,1,1,1"/>
                     <Setter Property="HorizontalContentAlignment" Value="Left"/>
                     <Setter Property="VerticalContentAlignment" Value="Center"/>
-                    <Setter Property="Padding" Value="60,6,15,6"/>
+                    <Setter Property="Padding" Value="15,6,15,6"/>
                     <Setter Property="IsTabStop" Value="False"/>
                     <Setter Property="Focusable" Value="False"/>
                     <Setter Property="MinWidth" Value="30"/>
@@ -468,11 +468,5 @@
         </Style>
     </UserControl.Resources>
 
-    <StackPanel x:Name="MainLayoutRoot" Width="{Binding Path=Width, ElementName=UserControl, Mode=Default}" Height="{Binding Path=Height, ElementName=UserControl, Mode=Default}" Background="{x:Null}">
-        <Custom:SurfaceScrollViewer Height="{Binding Path=Height, ElementName=UserControl, Mode=Default}" x:Name="SscrollViewer" Width="{Binding Path=Width, ElementName=MainLayoutRoot, Mode=Default}">
-            <StackPanel x:Name="LayoutRoot" Width="Auto" Height="Auto" Background="{x:Null}">
-            </StackPanel>
-        </Custom:SurfaceScrollViewer>
-
-    </StackPanel>
+    <StackPanel x:Name="LayoutRoot" Width="Auto" Height="Auto" Background="{x:Null}"/>
 </UserControl>
\ No newline at end of file