diff --git a/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml b/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml
index 5d707c4..e284469 100644
--- a/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml
+++ b/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml
@@ -56,7 +56,7 @@
                         Mode=OneWay, FallbackValue=404}" 
                                Foreground="White" FontSize="24"/>
                     <TextBlock x:Name="Factory1Reading"
-                               Text="{x:Bind _vm.Device1.LatestReading.reading ,
+                               Text="{x:Bind _vm.Device1.LatestReading.reading,
                         Mode=OneWay, FallbackValue=404}" Foreground="White"
                                VerticalAlignment="Bottom" FontSize="144"/>
                     <TextBlock Text="Factory 1" Foreground="White" FontSize="36"
@@ -69,9 +69,10 @@
                 FallbackValue=Orange}" Margin="12,0,12,12" Width="300" Height="300">
                 <StackPanel Margin="12" VerticalAlignment="Stretch">
                     <TextBlock x:Name="Factory2Time" Foreground="White" FontSize="24"
-                               Text="{x:Bind _vm.Device2.LatestStatus.time,
+                               Text="{x:Bind _vm.Device2.LatestReading.time,
                         Mode=OneWay, FallbackValue=404}" />
-                    <TextBlock x:Name="Factory2Reading" Text="{x:Bind _vm.Device2.LatestReading.reading,
+                    <TextBlock x:Name="Factory2Reading"
+                               Text="{x:Bind _vm.Device2.LatestReading.reading,
                         Mode=OneWay, FallbackValue=404}" Foreground="White"
                                VerticalAlignment="Bottom" FontSize="144"/>
                     <TextBlock Text="Factory 2" Foreground="White" FontSize="36"
diff --git a/src/EyesAndEars.UWP/EyesAndEars.UWP/ViewModels/MainPageVM.cs b/src/EyesAndEars.UWP/EyesAndEars.UWP/ViewModels/MainPageVM.cs
index 1f74c35..176e7e1 100644
--- a/src/EyesAndEars.UWP/EyesAndEars.UWP/ViewModels/MainPageVM.cs
+++ b/src/EyesAndEars.UWP/EyesAndEars.UWP/ViewModels/MainPageVM.cs
@@ -23,9 +23,9 @@ namespace EyesAndEars.UWP.ViewModels {
             Device1 = f1;
             Device2 = f2;
             Device3 = f3;
-            Device1 = g1;
-            Device2 = g2;
-            Device3 = g3;
+            Device4 = g1;
+            Device5 = g2;
+            Device6 = g3;
         }
 
         string _baseURL;