diff --git a/QSharpXamDemo/QSharpXamDemo.Android/QSharpXamDemo.Android.csproj b/QSharpXamDemo/QSharpXamDemo.Android/QSharpXamDemo.Android.csproj
index 750e15f..b5f7059 100644
--- a/QSharpXamDemo/QSharpXamDemo.Android/QSharpXamDemo.Android.csproj
+++ b/QSharpXamDemo/QSharpXamDemo.Android/QSharpXamDemo.Android.csproj
@@ -16,7 +16,6 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <AndroidUseAapt2>true</AndroidUseAapt2>
@@ -97,7 +96,7 @@
       <Name>QSharp</Name>
     </ProjectReference>
     <ProjectReference Include="..\QSharpXamDemo\QSharpXamDemo.csproj">
-      <Project>{48097AD8-2188-4F99-8092-E4EFD7571268}</Project>
+      <Project>{20D2D0D8-A518-42DC-BAB8-CF098CDF03C4}</Project>
       <Name>QSharpXamDemo</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml b/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml
index 1569e32..5646dde 100644
--- a/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml
+++ b/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml
@@ -22,14 +22,42 @@
 
         <Grid x:Name="selectedCueGrid"
               Grid.Row="0"
-              RowSpacing="0">
+              RowSpacing="0"
+              BackgroundColor="#D8D8D8">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*"/>
                 <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
-            <Frame Grid.RowSpan="2" BorderColor="Black"/>
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <Frame Grid.RowSpan="3" Grid.ColumnSpan="5" BorderColor="Black" BackgroundColor="Transparent"/>
             <ActivityIndicator x:Name="workspaceLoadingIndicator" Grid.Row="1" HeightRequest="20"/>
-            <Label Grid.Row ="0" Text="{Binding name}" VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand"/>
+
+            <Label Grid.Row ="0"
+                   Grid.Column="0"
+                   Text="{Binding number}"
+                   d:Text="100"
+                   VerticalOptions="CenterAndExpand"
+                   HorizontalOptions="CenterAndExpand"
+                   FontSize="Medium"/>
+
+            <Label Grid.Row ="1"
+                   Grid.Column="0"
+                   Grid.ColumnSpan="5"
+                   Text="{Binding name}"
+                   d:Text="Cue 1"
+                   VerticalOptions="CenterAndExpand"
+                   HorizontalOptions="CenterAndExpand"
+                   FontSize="Large"/>
+            
         </Grid>
 
     </Grid>
diff --git a/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml.cs b/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml.cs
index f9543a7..c0ad1e3 100644
--- a/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml.cs
+++ b/QSharpXamDemo/QSharpXamDemo/CueListPage.xaml.cs
@@ -1,21 +1,13 @@
-using System;
+
 using System.Collections.Generic;
-using System.Data;
-using System.Diagnostics;
-using System.Net.Http.Headers;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
-using System.Xml;
 using QSharp;
 using QSharpXamDemo.ViewModels;
 using Serilog;
-using Xamarin.Essentials;
 using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
 
 namespace QSharpXamDemo
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class CueListPage : ContentPage
     {
         private QWorkspace connectedWorkspace;
@@ -76,15 +68,16 @@ namespace QSharpXamDemo
             {
                 BindingContext = qCueViewModel,
                 HorizontalOptions = LayoutOptions.StartAndExpand,
-                VerticalTextAlignment = TextAlignment.Center
+                VerticalTextAlignment = TextAlignment.Center,
             };
             cueLabel.SetBinding(Label.TextProperty, "name", BindingMode.OneWay);
             var cueBackground = new Frame
             {
                 BindingContext = qCueViewModel,
-                Opacity = 0.75,
+                Opacity = 0.60,
                 HasShadow = false,
                 CornerRadius = 0,
+                BorderColor = Color.Black
             };
             cueBackground.SetBinding(BackgroundColorProperty, "color",BindingMode.OneWay);
 
diff --git a/QSharpXamDemo/QSharpXamDemo/ViewModels/QCueViewModel.cs b/QSharpXamDemo/QSharpXamDemo/ViewModels/QCueViewModel.cs
index 799d336..a8a6ea8 100644
--- a/QSharpXamDemo/QSharpXamDemo/ViewModels/QCueViewModel.cs
+++ b/QSharpXamDemo/QSharpXamDemo/ViewModels/QCueViewModel.cs
@@ -29,7 +29,7 @@ namespace QSharpXamDemo.ViewModels
         public string name { 
             get
             {
-                return cue.nonEmptyName;
+                return cue.displayName;
             }
 
             set
@@ -38,6 +38,19 @@ namespace QSharpXamDemo.ViewModels
             }
         }
 
+        public string number
+        {
+            get
+            {
+                return cue.number;
+            }
+
+            set
+            {
+                cue.number = value;
+            }
+        }
+
         public Color color
         {
             get
diff --git a/QSharpXamDemo/QSharpXamDemo/ViewModels/SelectedQCueViewModel.cs b/QSharpXamDemo/QSharpXamDemo/ViewModels/SelectedQCueViewModel.cs
index 2b19715..eca8e43 100644
--- a/QSharpXamDemo/QSharpXamDemo/ViewModels/SelectedQCueViewModel.cs
+++ b/QSharpXamDemo/QSharpXamDemo/ViewModels/SelectedQCueViewModel.cs
@@ -31,6 +31,19 @@ namespace QSharpXamDemo.ViewModels
             }
         }
 
+        public string number
+        {
+            get
+            {
+                return cue.number;
+            }
+
+            set
+            {
+                cue.number = value;
+            }
+        }
+
         public Color color
         {
             get