diff --git a/Client/Views/GameWindow.xaml b/Client/Views/GameWindow.xaml
index 5998e63..a79e2c6 100644
--- a/Client/Views/GameWindow.xaml
+++ b/Client/Views/GameWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Client.Views"
         mc:Ignorable="d"
-        Title="GameWindow" Height="600" Width="1200">
+        Title="Scrubl.io" Height="600" Width="1200">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="50"/>
@@ -30,14 +30,7 @@
                 <RowDefinition/>
             </Grid.RowDefinitions>
 
-            <Label Grid.Row="0" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="1" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="2" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="3" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="4" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="5" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="6" Content="{Binding Path=...}" FontSize="15"/>
-            <Label Grid.Row="7" Content="{Binding Path=...}" FontSize="15"/>
+            
         </Grid>
 
         <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right" Width="100" Margin="10, 10, 10, 10" Content="RESET" />
diff --git a/Client/Views/MainWindow.xaml b/Client/Views/MainWindow.xaml
index cfaf897..7830f07 100644
--- a/Client/Views/MainWindow.xaml
+++ b/Client/Views/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Client"
         mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
+        Title="Scrubl.io" Height="450" Width="800">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
@@ -67,8 +67,8 @@
                 <RowDefinition Height="50"/>
                 <RowDefinition Height="50"/>
             </Grid.RowDefinitions>
-            <Button Grid.Row="0" Content="join a selected lobby" Click="Button_Click" Width="200" Height="40" HorizontalAlignment="Left" Margin="10, 0, 0, 0"/>
-            <Button Grid.Row="1" Content="host a new lobby" Command="{Binding ...}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/>
+            <Button Name="joinButton" Grid.Row="0" Content="join a selected lobby" Click="Button_Click" Width="200" Height="40" HorizontalAlignment="Left" Margin="10, 0, 0, 0"/>
+            <Button Name="hostButton" Grid.Row="1" Content="host a new lobby" Command="{Binding ...}" Width="200" Height="40" HorizontalAlignment="left" Margin="10, 0, 0, 0"/>
         </Grid>
 
     </Grid>
diff --git a/Client/Views/MainWindow.xaml.cs b/Client/Views/MainWindow.xaml.cs
index 43f75ee..ccbf69d 100644
--- a/Client/Views/MainWindow.xaml.cs
+++ b/Client/Views/MainWindow.xaml.cs
@@ -35,6 +35,9 @@ namespace Client
                 testLabel.Content = lobbySelected.ID;
                 usernameTextbox.IsEnabled = false;
                 colorSelection.IsEnabled = false;
+                joinButton.IsEnabled = false;
+                hostButton.IsEnabled = false;
+
                 GameWindow window = new GameWindow();
                 window.Show();
             }