diff -r 5af0f0a8706d -r e95e916eb018 src/FingersDance.Control.Pivot/UserControlPivot.xaml
--- a/src/FingersDance.Control.Pivot/UserControlPivot.xaml	Thu Sep 17 18:44:33 2009 +0200
+++ b/src/FingersDance.Control.Pivot/UserControlPivot.xaml	Sun Sep 20 18:02:37 2009 +0200
@@ -5,7 +5,7 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d"
 	x:Class="FingersDance.Control.Pivot.UserControlPivot"
-	x:Name="UserControl" Width="70" Height="70" xmlns:Custom="http://schemas.microsoft.com/surface/2008">
+	x:Name="UserControl" Width="90" Height="90" xmlns:Custom="http://schemas.microsoft.com/surface/2008">
 	<UserControl.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
@@ -22,24 +22,9 @@
 			<ColumnDefinition Width="0.506*"/>
 			<ColumnDefinition Width="0.494*"/>
 		</Grid.ColumnDefinitions>
-		<Ellipse Stroke="#FFFFFFFF" Grid.ColumnSpan="2" Grid.RowSpan="2" StrokeThickness="1.5">
-			<Ellipse.Fill>
-				<RadialGradientBrush>
-					<RadialGradientBrush.RelativeTransform>
-						<TransformGroup>
-							<ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="0.93" ScaleY="0.93"/>
-							<SkewTransform AngleX="0" AngleY="0" CenterX="0.5" CenterY="0.5"/>
-							<RotateTransform Angle="0" CenterX="0.5" CenterY="0.5"/>
-							<TranslateTransform X="0" Y="0"/>
-						</TransformGroup>
-					</RadialGradientBrush.RelativeTransform>
-					<GradientStop Color="#FFFFFFFF" Offset="0"/>
-					<GradientStop Color="#FF000000" Offset="0.258"/>
-				</RadialGradientBrush>
-			</Ellipse.Fill>
-		</Ellipse>
-		<Custom:SurfaceButton BorderThickness="0,0,0,0" HorizontalAlignment="Center" x:Name="SurfaceButtonPlayer1" VerticalAlignment="Center" Content="" Background="{DynamicResource Color_8_#230FD2_xaml}" ContactDown="SurfaceButtonPlayer1_ContactDown" Click="SurfaceButtonPlayer1_Click"/>
-		<Custom:SurfaceButton Content="" HorizontalAlignment="Center" x:Name="SurfaceButtonPlayer2" VerticalAlignment="Center" Grid.Column="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_4_#FF0000_xaml}" ContactDown="SurfaceButtonPlayer2_ContactDown" Click="SurfaceButtonPlayer2_Click">
+		<Ellipse Stroke="#FFFFFFFF" Grid.ColumnSpan="2" Grid.RowSpan="2" StrokeThickness="0.5" Fill="#FF000000" Margin="0.462,0,-0.462,0"/>
+		<Custom:SurfaceButton BorderThickness="0,0,0,0" x:Name="SurfaceButtonPlayer1" Content="" Background="{DynamicResource Color_8_#230FD2_xaml}" ContactDown="SurfaceButtonPlayer1_ContactDown" Click="SurfaceButtonPlayer1_Click" Margin="10.377,11.057,6.827,5.11"/>
+		<Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer2" Grid.Column="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_4_#FF0000_xaml}" ContactDown="SurfaceButtonPlayer2_ContactDown" Click="SurfaceButtonPlayer2_Click" Margin="6.335,11.235,9.272,4.932">
 			<Custom:SurfaceButton.RenderTransform>
 				<TransformGroup>
 					<ScaleTransform ScaleX="-1" ScaleY="1"/>
@@ -49,7 +34,7 @@
 				</TransformGroup>
 			</Custom:SurfaceButton.RenderTransform>
 		</Custom:SurfaceButton>
-		<Custom:SurfaceButton Content="" HorizontalAlignment="Center" x:Name="SurfaceButtonPlayer3" VerticalAlignment="Center" Grid.Row="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_12_#00C800_xaml}" ContactDown="SurfaceButtonPlayer3_ContactDown" Click="SurfaceButtonPlayer3_Click" >
+		<Custom:SurfaceButton Content="" x:Name="SurfaceButtonPlayer3" Grid.Row="1" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_12_#00C800_xaml}" ContactDown="SurfaceButtonPlayer3_ContactDown" Click="SurfaceButtonPlayer3_Click" Margin="10.04,4.107,6.527,11.888" >
 			<Custom:SurfaceButton.RenderTransform>
 				<TransformGroup>
 					<ScaleTransform ScaleX="1" ScaleY="-1"/>
@@ -59,7 +44,7 @@
 				</TransformGroup>
 			</Custom:SurfaceButton.RenderTransform>
 		</Custom:SurfaceButton>
-		<Custom:SurfaceButton Content=""  Grid.Row="1" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" x:Name="SurfaceButtonPlayer4" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_2_#FFC800_xaml}" ContactDown="SurfaceButtonPlayer4_ContactDown" Click="SurfaceButtonPlayer4_Click">
+		<Custom:SurfaceButton Content=""  Grid.Row="1" Grid.Column="1" x:Name="SurfaceButtonPlayer4" RenderTransformOrigin="0.5,0.5" Background="{DynamicResource Color_2_#FFC800_xaml}" ContactDown="SurfaceButtonPlayer4_ContactDown" Click="SurfaceButtonPlayer4_Click" Margin="6.365,3.685,7.938,12.539">
 			<Custom:SurfaceButton.RenderTransform>
 				<TransformGroup>
 					<ScaleTransform ScaleX="-1" ScaleY="-1"/>
@@ -69,7 +54,13 @@
 				</TransformGroup>
 			</Custom:SurfaceButton.RenderTransform>
 		</Custom:SurfaceButton>
-		<Ellipse Height="17.573" HorizontalAlignment="Right" VerticalAlignment="Top" Width="17.573" Margin="0,-8.742,-8.566,0" Grid.Row="1" Fill="{x:Null}" StrokeThickness="1.5">
+		<Ellipse Height="25" HorizontalAlignment="Left" VerticalAlignment="Top" Width="25" Margin="-12.479,-12.358,0,0" Grid.Row="1" StrokeThickness="0.5" Grid.Column="1">
+			<Ellipse.Fill>
+				<RadialGradientBrush>
+					<GradientStop Color="#FF000000" Offset="0.788"/>
+					<GradientStop Color="#FFFFFFFF" Offset="0"/>
+				</RadialGradientBrush>
+			</Ellipse.Fill>
 			<Ellipse.Stroke>
 				<RadialGradientBrush>
 					<GradientStop Color="#FF8A8888" Offset="0"/>