diff --git a/VRDash/UI/LocationEditors/ControllerLocationEditor.xaml.cs b/VRDash/UI/LocationEditors/ControllerLocationEditor.xaml.cs
index c83fd53..f1fd814 100644
--- a/VRDash/UI/LocationEditors/ControllerLocationEditor.xaml.cs
+++ b/VRDash/UI/LocationEditors/ControllerLocationEditor.xaml.cs
@@ -80,6 +80,7 @@ namespace VRDash.UI.LocationEditors
 
             var lstControl = lstElement.OfType<Control>();
 
+            //Lazy way of updating all of those text boxes.
             foreach(var control in children)
             {
                 if (control.GetType() == typeof(DockPanel))
diff --git a/VRDash/UI/OverlayEditor.xaml b/VRDash/UI/OverlayEditor.xaml
index a93a004..70fb279 100644
--- a/VRDash/UI/OverlayEditor.xaml
+++ b/VRDash/UI/OverlayEditor.xaml
@@ -21,7 +21,7 @@
         <Border x:Name="bdrContent" Grid.Row="0" Grid.ColumnSpan="3"/>
 
 
-        <GroupBox Header="Location Settings" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Left" Margin="0,5,0,5">
+        <GroupBox x:Name="gbLocationSettings" Header="Location Settings" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Left" Margin="0,5,0,5">
             <Border x:Name="bdrLocationEditor" HorizontalAlignment="Center" VerticalAlignment="Center" />
         </GroupBox>
         <TextBlock Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center">Overlay Width:</TextBlock>
diff --git a/VRDash/UI/OverlayEditor.xaml.cs b/VRDash/UI/OverlayEditor.xaml.cs
index 1baae24..e32b05f 100644
--- a/VRDash/UI/OverlayEditor.xaml.cs
+++ b/VRDash/UI/OverlayEditor.xaml.cs
@@ -40,14 +40,11 @@ namespace VRDash.UI
                 UserControl locationEditor = (UserControl)Activator.CreateInstance(locationInfo.LocationEditorType, new object[] { Config.Location });
                 bdrLocationEditor.Child = locationEditor;
             }
-#if DEBUG
             else
             {
-                var textBlock = new TextBlock();
-                textBlock.Text = "No location editor!";
-                bdrLocationEditor.Child = textBlock;
+                var parent = VisualTreeHelper.GetParent(gbLocationSettings);
+                ((Panel)parent).Children.Remove(gbLocationSettings);
             }
-#endif
         }
 
         private void tbWidth_PreviewTextInput(object sender, TextCompositionEventArgs e)