--- a/src/FingersDance.Control.UserPanel/SurfaceUserPanelTest.xaml	Sun Aug 09 18:29:41 2009 +0200
+++ b/src/FingersDance.Control.UserPanel/SurfaceUserPanelTest.xaml	Mon Aug 17 22:04:09 2009 +0200
@@ -2,18 +2,22 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:s="http://schemas.microsoft.com/surface/2008"
-	xmlns:FingersDance_Control_Player="clr-namespace:FingersDance.Control.Player;assembly=FingersDance.Control.Player"
-    xmlns:FingersDance_Control_TimeLine="clr-namespace:FingersDance.Control.TimeLine;assembly=FingersDance.Control.TimeLine"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+    mc:Ignorable="d" 
+    
     x:Class="FingersDance.Control.UserPanel.SurfaceWindow1"
     Title="FingersDance.Control.UserPanel"
-	xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" Activated="SurfaceWindow_Activated"
+     xmlns:FingersDance_Control_UserPanel="clr-namespace:FingersDance.Control.UserPanel"
+    xmlns:FingersDance_Control_SyncSource="clr-namespace:FingersDance.Control.SyncSource;assembly=FingersDance.Control.SyncSource"
+    
     >
   <s:SurfaceWindow.Resources>
     <ImageBrush x:Key="WindowBackground" Stretch="None" Opacity="0.6" ImageSource="pack://application:,,,/Resources/WindowBackground.jpg"/>
   </s:SurfaceWindow.Resources>
 
   <Grid Background="{StaticResource WindowBackground}" >
-  	<FingersDance_Control_TimeLine:UserControlTimeLine Margin="182,89,206,0" VerticalAlignment="Top" Height="34" x:Name="UserControlTimeLine" DragStarted="UserControlTimeLine_DragStarted" DragCompleted="UserControlTimeLine_DragCompleted" TimerTick="UserControlTimeLine_TimerTick"/>
-    <FingersDance_Control_Player:UserControlPlayer d:LayoutOverrides="Margin" Margin="196.064,196.452,220.064,74.452" PlayerOpened="UserControlPlayer_PlayerOpened" x:Name="UserControlPlayer" />
+  	<FingersDance_Control_UserPanel:UserControlUserPanel/>
+        <!--<FingersDance_Control_SyncSource:UserControlSyncSource/>-->
     </Grid>
 </s:SurfaceWindow>