diff --git a/qController.Standard/Pages/App.xaml b/qController.Standard/Pages/App.xaml
index 91e9463..d556631 100644
--- a/qController.Standard/Pages/App.xaml
+++ b/qController.Standard/Pages/App.xaml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Application xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="qController.App">
+<Application xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="qController.App">
 	<Application.Resources>
 		<!-- Application resource dictionary -->
         <OnPlatform x:Key="qfont" x:TypeArguments="x:String">
diff --git a/qController.Standard/Pages/ControlPage.xaml b/qController.Standard/Pages/ControlPage.xaml
index 2e14a8f..7490665 100644
--- a/qController.Standard/Pages/ControlPage.xaml
+++ b/qController.Standard/Pages/ControlPage.xaml
@@ -5,7 +5,11 @@
              BackgroundColor="#4A4A4A">
 	<ContentPage.Content>
         <AbsoluteLayout x:Name="sLayout">
-            <Grid x:Name="topBar" HorizontalOptions="FillAndExpand" AbsoluteLayout.LayoutBounds="0,0,1,.09" AbsoluteLayout.LayoutFlags="All" BackgroundColor="#71AEFF">
+            <Grid x:Name="topBar"
+                  HorizontalOptions="FillAndExpand"
+                  AbsoluteLayout.LayoutBounds="0,0,1,.09"
+                  AbsoluteLayout.LayoutFlags="All"
+                  BackgroundColor="#71AEFF">
               <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
               </Grid.RowDefinitions>
@@ -13,8 +17,20 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="4*" />
               </Grid.ColumnDefinitions>
-              <Label x:Name = "menuButton" FontFamily = "{StaticResource qfont}"  HorizontalOptions = "Start" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="0" FontSize="25" Text="&#xF0C9;"/>
-              <Label x:Name = "instanceName" HorizontalTextAlignment="End" HorizontalOptions = "FillAndExpand" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="1"/>
+              <Label x:Name="menuButton"
+                     FontFamily="{StaticResource qfont}"
+                     HorizontalOptions="Start"
+                     VerticalOptions="End"
+                     Margin="20,10,20,10"
+                     Grid.Row="0" Grid.Column="0"
+                     FontSize="25"
+                     Text="&#xF0C9;"/>
+              <Label x:Name="instanceName"
+                     HorizontalOptions = "FillAndExpand"
+                     VerticalOptions="End"
+                     HorizontalTextAlignment="End"
+                     Margin="20,10,20,10"
+                     Grid.Row="0" Grid.Column="1"/>
             </Grid>
         </AbsoluteLayout>
 	</ContentPage.Content>
diff --git a/qController.Standard/Pages/MenuPage.xaml b/qController.Standard/Pages/MenuPage.xaml
index eb0969f..41618d6 100644
--- a/qController.Standard/Pages/MenuPage.xaml
+++ b/qController.Standard/Pages/MenuPage.xaml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="qController.MenuPage">
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="qController.MenuPage">
     <StackLayout>
         <ListView x:Name="listView">
-      </ListView>
+        </ListView>
     </StackLayout>
 </ContentPage>
diff --git a/qController.Standard/Pages/WorkspacePage.xaml b/qController.Standard/Pages/WorkspacePage.xaml
index 6b2fd13..c5f9484 100644
--- a/qController.Standard/Pages/WorkspacePage.xaml
+++ b/qController.Standard/Pages/WorkspacePage.xaml
@@ -5,15 +5,15 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:qui="clr-namespace:qController.UI"
              mc:Ignorable="d"
-             x:Class="qController.WorkspacePage">
+             x:Class="qController.WorkspacePage"
+             BackgroundColor="#8F8A99">
     <Grid RowSpacing="0">
         <Grid.RowDefinitions>
-            <RowDefinition Height="150"/>
+            <RowDefinition Height="175"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-
         
-        <qui:QSelectedCueGrid x:Name="selectedCueGrid"
+        <qui:QSelectedCueFrame x:Name="selectedCueFrame"
                                  Grid.Row="0"/>
 
 
@@ -58,10 +58,9 @@
         <ScrollView x:Name="cueListScrollView" 
                     Grid.Row="1">
             <Grid x:Name="cueListsGrid"
-          RowSpacing="0"
-          ColumnSpacing="0"
-          BackgroundColor="#808080">
-                <Grid.RowDefinitions></Grid.RowDefinitions>
+                  RowSpacing="0"
+                  ColumnSpacing="0"
+                  BackgroundColor="#808080">
 
             </Grid>
         </ScrollView>
diff --git a/qController.Standard/Pages/qConnectionPage.xaml b/qController.Standard/Pages/qConnectionPage.xaml
index 9df03fb..8c06605 100644
--- a/qController.Standard/Pages/qConnectionPage.xaml
+++ b/qController.Standard/Pages/qConnectionPage.xaml
@@ -1,17 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:local="clr-namespace:qController" x:Class="qController.QConnectionPage">
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="qController.QConnectionPage">
     <StackLayout x:Name="sLayout">
-        <Grid x:Name="topBar" HorizontalOptions="FillAndExpand" BackgroundColor="#71AEFF">
-          <Grid.RowDefinitions>
+        <Grid x:Name="topBar"
+              HorizontalOptions="FillAndExpand"
+              BackgroundColor="#71AEFF">
+            <Grid.RowDefinitions>
             <RowDefinition Height="*" />
-          </Grid.RowDefinitions>
-          <Grid.ColumnDefinitions>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="*" />
-          </Grid.ColumnDefinitions>
-          <Label x:Name = "menuButton" FontFamily = "{StaticResource qfont}" HorizontalOptions = "Start" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="0" Text="&#xF0C9;"/>
+            </Grid.ColumnDefinitions>
+            <Label x:Name = "menuButton"
+                    FontFamily = "{StaticResource qfont}"
+                    HorizontalOptions = "Start"
+                    VerticalOptions="End"
+                    Margin="20,10,20,10"
+                    Grid.Row="0" Grid.Column="0"
+                    Text="&#xF0C9;"/>
         </Grid>
-        <ListView x:Name="listView" HasUnevenRows="true" BackgroundColor="#4A4A4A" SeparatorVisibility="None"></ListView>  
+        <ListView x:Name="listView"
+                  HasUnevenRows="true"
+                  BackgroundColor="#4A4A4A"
+                  SeparatorVisibility="None">
+
+        </ListView>  
     </StackLayout>
 </ContentPage>
\ No newline at end of file