diff --git a/src/EyesAndEars.UWP/EyesAndEars.UWP/EyesAndEars.UWP.csproj b/src/EyesAndEars.UWP/EyesAndEars.UWP/EyesAndEars.UWP.csproj
index 358c4ae..b6e9457 100644
--- a/src/EyesAndEars.UWP/EyesAndEars.UWP/EyesAndEars.UWP.csproj
+++ b/src/EyesAndEars.UWP/EyesAndEars.UWP/EyesAndEars.UWP.csproj
@@ -19,9 +19,9 @@
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <PackageCertificateKeyFile>EyesAndEars.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>
-    </PackageCertificateThumbprint>
+    <PackageCertificateKeyFile>
+    </PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>DAE20EE5240091F7E98C03948A35781171CB1005</PackageCertificateThumbprint>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
diff --git a/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml b/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml
index fc19994..bbb7a05 100644
--- a/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml
+++ b/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml
@@ -7,9 +7,9 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     Background="{ThemeResource SystemControlAcrylicWindowBrush}">
-    
+
     <Grid Margin="12">
-        
+
         <Grid.RowDefinitions>
             <RowDefinition Height="96"/>
             <RowDefinition Height="Auto"/>
@@ -42,7 +42,7 @@
             </StackPanel>
         </StackPanel>
 
-        <Grid Grid.Row="1" Margin="0,12">
+        <Grid Grid.Row="1" Margin="0,12,0,0">
 
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
@@ -129,8 +129,8 @@
                     <TextBlock Text="Dashboard updates at slower rate than devices."
                                FontSize="18" Margin="0" Foreground="SlateGray"
                                VerticalAlignment="Center"/>
-                    </StackPanel>
-                
+                </StackPanel>
+
             </Grid>
             <!-- This device is not in use. Uncomment if becomes available. -->
             <!--<Grid x:Name="Factory3Grid" Grid.Row="0" Grid.Column="2"
@@ -204,26 +204,25 @@
 
         </Grid>
 
-        <Grid Grid.Row="2" Margin="0,0,0,0">
-            <ScrollViewer x:Name="LogViewer" Visibility="Visible" 
-                          VerticalScrollBarVisibility="Visible"
-                          HorizontalScrollMode="Disabled"
-                          VerticalScrollMode="Enabled" Margin="0,20">
-                <RichTextBlock x:Name="Logs" FontSize="16"
-                               FontFamily="Consolas">
+        <Grid Grid.Row="2" Margin="0,0,0,8">
+            <ScrollViewer x:Name="LogViewer" VerticalScrollBarVisibility="Visible"
+                          HorizontalScrollMode="Disabled" Margin="0"
+                          VerticalScrollMode="Enabled">
+                <RichTextBlock x:Name="Logs" FontSize="16" FontFamily="Consolas">
                 </RichTextBlock>
             </ScrollViewer>
         </Grid>
-        
+
         <Grid Grid.Row="3" Margin="0">
 
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="113"/>
+                <ColumnDefinition Width="45"/>
                 <ColumnDefinition Width="*" MinWidth="350"/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
 
-            <StackPanel Orientation="Horizontal" Grid.Column="0">
+            <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="2">
 
                 <ToggleButton x:Name="LogToggle" FontFamily="Segoe MDL2 Assets"
                         Content="&#xE8BC;" HorizontalAlignment="Right"
@@ -242,17 +241,15 @@
                              ToolTipService.ToolTip="This is a link to a webpage with information about Nicola and the project."/>
             </StackPanel>
 
-            <TextBox x:Name="WebAddressBox" Grid.Column="1" FontSize="26"
-                     Text="{x:Bind _vm.BaseURL , Mode=TwoWay}"
-                     Padding="20" TextAlignment="Left"
-                     HorizontalAlignment="Stretch" TextWrapping="NoWrap"
-                     Margin="0" VerticalAlignment="Center"
+            <TextBox x:Name="WebAddressBox" Grid.Column="2" FontSize="26"
+                     Text="{x:Bind _vm.BaseURL, Mode=TwoWay}"
+                     Padding="20" TextAlignment="Left" TextWrapping="NoWrap" VerticalAlignment="Center"
                      HorizontalContentAlignment="Left"
                      ToolTipService.Placement="Mouse"
                      ToolTipService.ToolTip="The base U.R.L. used to form the A.P.I. queries."
                      PlaceholderText="Enter the base U.R.L. here..." />
 
-            <StackPanel Orientation="Horizontal" Grid.Column="2">
+            <StackPanel Orientation="Horizontal" Grid.Column="3">
                 <ToggleButton x:Name="PlayButton" FontFamily="Segoe MDL2 Assets"
                               Content="&#xE71A;" Height="79" Width="79"
                               VerticalAlignment="Center" FontSize="28"
diff --git a/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml.cs b/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml.cs
index b553846..a00a2e6 100644
--- a/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml.cs
+++ b/src/EyesAndEars.UWP/EyesAndEars.UWP/MainPage.xaml.cs
@@ -12,6 +12,7 @@ namespace EyesAndEars.UWP {
 
         MainPageVM _vm = new MainPageVM();
         DispatcherTimer _dispatcherTimer = new DispatcherTimer();
+        bool _logData;
 
         public MainPage() {
             InitializeComponent();
@@ -52,14 +53,14 @@ namespace EyesAndEars.UWP {
             if (!string.IsNullOrEmpty(url)) {
                 // Devices 3 and 6 are not in use.
                 _vm.Device1 = await DataServices.UpdateDevice
-                    (url, 1, Logs, _vm.Device1.LatestStatus.status, AudioUpdater);
+                    (url, 1, Logs, _vm.Device1.LatestStatus.status, AudioUpdater, _logData);
                 _vm.Device2 = await DataServices.UpdateDevice
-                    (url, 2, Logs, _vm.Device2.LatestStatus.status, AudioUpdater);
+                    (url, 2, Logs, _vm.Device2.LatestStatus.status, AudioUpdater, _logData);
                 // _vm.Device3 = await DataServices.UpdateDevice(url, 3);
                 _vm.Device4 = await DataServices.UpdateDevice
-                    (url, 4, Logs, _vm.Device4.LatestStatus.status, AudioUpdater);
+                    (url, 4, Logs, _vm.Device4.LatestStatus.status, AudioUpdater, _logData);
                 _vm.Device5 = await DataServices.UpdateDevice
-                    (url, 5, Logs, _vm.Device5.LatestStatus.status, AudioUpdater);
+                    (url, 5, Logs, _vm.Device5.LatestStatus.status, AudioUpdater, _logData);
                 // _vm.Device6 = await DataServices.UpdateDevice(url, 6);
                 _vm.CurrentTime = DateTime.UtcNow.ToShortTimeString();
             }
@@ -83,11 +84,12 @@ namespace EyesAndEars.UWP {
         }
 
         private void LogToggle_Unchecked(object sender, RoutedEventArgs e) {
-            LogViewer.Visibility = Visibility.Collapsed;
+            _logData = false;
+            Logs.Blocks.Clear();
         }
 
         private void LogToggle_Checked(object sender, RoutedEventArgs e) {
-            LogViewer.Visibility = Visibility.Visible;
+            _logData = true;
         }
     }
 }
diff --git a/src/EyesAndEars.UWP/EyesAndEars.UWP/Services/DataServices.cs b/src/EyesAndEars.UWP/EyesAndEars.UWP/Services/DataServices.cs
index fe0de8d..b1dec6e 100644
--- a/src/EyesAndEars.UWP/EyesAndEars.UWP/Services/DataServices.cs
+++ b/src/EyesAndEars.UWP/EyesAndEars.UWP/Services/DataServices.cs
@@ -16,7 +16,7 @@ namespace EyesAndEars.UWP.Services {
 
         static SpeechSynthesizer _synth = new SpeechSynthesizer();
         public static async Task<Device> UpdateDevice(string url, int deviceId,
-            RichTextBlock logs, string currentStatus, MediaElement audioUpdater) {
+            RichTextBlock logs, string currentStatus, MediaElement audioUpdater, bool _logData) {
             try {
                 var id = MapFactoryDeviceToGalleyDevice(deviceId); // Has note.
                 var readingAPI = $"{url}/api/readings/latest/{id}";
@@ -27,7 +27,7 @@ namespace EyesAndEars.UWP.Services {
                 var s = MapToDeviceStatus(statusJSON);
                 var c = UpdateStatusColour(deviceId, s.status, r.reading);
                 var dev = new Device(deviceId, r, s, c);
-                LogUpdate(logs, dev);
+                if(_logData == true) LogUpdate(logs, dev);
                 NotifyAnyStatusChanges(currentStatus, dev, audioUpdater);
                 return dev;
             }