diff --git a/src/render/camera/ArcCamera.cpp b/src/render/camera/ArcCamera.cpp
index 166b810..ab7e286 100644
--- a/src/render/camera/ArcCamera.cpp
+++ b/src/render/camera/ArcCamera.cpp
@@ -92,7 +92,7 @@ void ArcCamera::handleKeyRelease(const int key) {
 }
 
 void ArcCamera::move(const float deltaTime) {
-  const auto velocity = moveSpeed * deltaTime;
+  const auto velocity = moveSpeed * moveSpeedSizeScale * deltaTime;
   const auto cameraDirection = glm::normalize(position - target);
   const auto right = glm::normalize(glm::cross(cameraDirection, world_up));
   const auto up = glm::normalize(glm::cross(right, cameraDirection));
diff --git a/src/render/camera/ArcCamera.h b/src/render/camera/ArcCamera.h
index e9470b0..4ca33ac 100644
--- a/src/render/camera/ArcCamera.h
+++ b/src/render/camera/ArcCamera.h
@@ -64,6 +64,7 @@ class ArcCamera {
   const glm::vec3 world_up{0.0f, 1.0f, 0.0f};
   float mouseTurnSpeed;
   float moveSpeed;
+  float moveSpeedSizeScale{1.0f};
   float keyboardTurnSpeed;
   float fieldOfView;
   float zoomSpeed{0.5f}; // TODO: Make configurable
diff --git a/src/render/camera/Camera.cpp b/src/render/camera/Camera.cpp
index 1330048..22d37ee 100644
--- a/src/render/camera/Camera.cpp
+++ b/src/render/camera/Camera.cpp
@@ -138,8 +138,8 @@ glm::mat4 Camera::view_matrix() const {
   return glm::lookAt(position, position + front, up);
 }
 
-void Camera::move(float delta_time) {
-  auto velocity = move_speed * delta_time;
+void Camera::move(const float delta_time) {
+  const auto velocity = move_speed * moveSpeedSizeScale * delta_time;
 
   if (active.front_back == active_directions::direction::forward)
     position += front * velocity;
@@ -164,7 +164,7 @@ void Camera::move(float delta_time) {
   if (active.turn == active_directions::side::none)
     return;
 
-  auto turnVelocity = turnSpeed * delta_time;
+  const auto turnVelocity = turnSpeed * delta_time;
   if (active.turn == active_directions::side::left)
     yaw -= turnVelocity;
   else if (active.turn == active_directions::side::right)
@@ -191,6 +191,14 @@ void Camera::mouse_move(float delta_x, float delta_y) {
   update();
 }
 
+float Camera::getMoveSpeedSizeScale() const {
+  return moveSpeedSizeScale;
+}
+
+void Camera::setMoveSpeedSizeScale(const float value) {
+  moveSpeedSizeScale = value;
+}
+
 Camera::move_state Camera::getMobility() const {
   return mobility;
 }
diff --git a/src/render/camera/Camera.h b/src/render/camera/Camera.h
index e0cb9b4..98d4e35 100644
--- a/src/render/camera/Camera.h
+++ b/src/render/camera/Camera.h
@@ -75,6 +75,7 @@ class Camera {
   float yaw{-90.0f};
   float pitch{0.0f};
 
+  float moveSpeedSizeScale{1.0f};
   float move_speed{0.05f};
   float turnSpeed{0.1};
   float mouseTurnSpeed{0.5f};
@@ -133,6 +134,9 @@ class Camera {
   void move(float delta_time);
   void mouse_move(float delta_x, float delta_y);
 
+  [[nodiscard]] float getMoveSpeedSizeScale() const;
+  void setMoveSpeedSizeScale(float value);
+
   [[nodiscard]] glm::vec3 get_position() const;
   void setPosition(const glm::vec3 &value);
 
diff --git a/src/render/helper/Floor.cpp b/src/render/helper/Floor.cpp
index b2f8763..913ba4c 100644
--- a/src/render/helper/Floor.cpp
+++ b/src/render/helper/Floor.cpp
@@ -72,4 +72,12 @@ texture_id Floor::getTextureId() const {
   return *mesh.getMaterial().textureId;
 }
 
+float Floor::getSize() const {
+  return size;
+}
+
+void Floor::setSize(const float value) {
+  size = value;
+}
+
 } // namespace netsimulyzer
diff --git a/src/render/helper/Floor.h b/src/render/helper/Floor.h
index 36aa6f8..c05ab76 100644
--- a/src/render/helper/Floor.h
+++ b/src/render/helper/Floor.h
@@ -46,6 +46,7 @@ class Floor {
   Mesh mesh;
   glm::vec3 position{0.0f};
   glm::mat4 model{1.0f};
+  float size{100.0f};
 
 public:
   explicit Floor(Mesh mesh);
@@ -64,6 +65,9 @@ class Floor {
   [[nodiscard]] const Mesh &getMesh() const;
   [[nodiscard]] texture_id getTextureId() const;
 
+  [[nodiscard]] float getSize() const;
+  void setSize(float value);
+
   void render();
 };
 
diff --git a/src/render/renderer/Renderer.cpp b/src/render/renderer/Renderer.cpp
index 7053e63..cd22640 100644
--- a/src/render/renderer/Renderer.cpp
+++ b/src/render/renderer/Renderer.cpp
@@ -443,6 +443,8 @@ void Renderer::resize(Floor &f, float size) {
 
   glBindBuffer(GL_ARRAY_BUFFER, renderInfo.vbo);
   glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(floorVertices), reinterpret_cast<const void *>(floorVertices));
+
+  f.setSize(size);
 }
 
 CoordinateGrid::RenderInfo Renderer::allocateCoordinateGrid(float size, int stepSize) {
diff --git a/src/settings/SettingsManager.h b/src/settings/SettingsManager.h
index 75832e9..05b44a8 100644
--- a/src/settings/SettingsManager.h
+++ b/src/settings/SettingsManager.h
@@ -27,6 +27,7 @@ class SettingsManager {
     LastLoadPath,
     ResourcePath,
     MoveSpeed,
+    AutoScaleMoveSpeed,
     KeyboardTurnSpeed,
     MouseTurnSpeed,
     FieldOfView,
@@ -192,6 +193,7 @@ class SettingsManager {
       {Key::LastLoadPath, {"application/lastLoadPath", {}}},
       {Key::ResourcePath, {"resources/resourcePath", {}}},
       {Key::MoveSpeed, {"camera/moveSpeed", 0.02f}},
+      {Key::AutoScaleMoveSpeed, {"camera/autoScaleMoveSpeed", false}},
       {Key::KeyboardTurnSpeed, {"camera/keyboardTurnSpeed", 0.1f}},
       {Key::MouseTurnSpeed, {"camera/mouseTurnSpeed", 0.5f}},
       {Key::FieldOfView, {"camera/fieldOfView", 45.0f}},
diff --git a/src/window/MainWindow.cpp b/src/window/MainWindow.cpp
index 8654ac4..6dac572 100644
--- a/src/window/MainWindow.cpp
+++ b/src/window/MainWindow.cpp
@@ -180,10 +180,7 @@ MainWindow::MainWindow() : QMainWindow() {
     settingsDialog.show();
   });
 
-  QObject::connect(&settingsDialog, &SettingsDialog::moveSpeedChanged, [this](float value) {
-    scene.getCamera().setMoveSpeed(value);
-    scene.getArcCamera().moveSpeed = value;
-  });
+  QObject::connect(&settingsDialog, &SettingsDialog::moveSpeedChanged, &scene, &SceneWidget::setCameraMoveSpeed);
 
   QObject::connect(&settingsDialog, &SettingsDialog::keyboardTurnSpeedChanged, [this](float value) {
     scene.getCamera().setTurnSpeed(value);
@@ -253,6 +250,9 @@ MainWindow::MainWindow() : QMainWindow() {
     scene.setCameraType(SettingsManager::CameraTypeFromInt(value));
   });
 
+  QObject::connect(&settingsDialog, &SettingsDialog::autoscaleMoveSpeedChanged, &scene,
+                   &SceneWidget::setAutoscaleCameraMoveSpeed);
+
   QObject::connect(&settingsDialog, &SettingsDialog::renderFloorChanged, &scene, &SceneWidget::setFloorRenderState);
 
   QObject::connect(&settingsDialog, &SettingsDialog::backgroundColorChanged, &scene, &SceneWidget::setClearColor);
diff --git a/src/window/scene/SceneWidget.cpp b/src/window/scene/SceneWidget.cpp
index db2c3b5..190e31e 100644
--- a/src/window/scene/SceneWidget.cpp
+++ b/src/window/scene/SceneWidget.cpp
@@ -224,6 +224,51 @@ void SceneWidget::handleUndoEvents() {
     emit selectedItemUpdated();
 }
 
+float SceneWidget::getCameraAutoscale() const {
+  // Scale camera movement so we may cross the whole simulation
+  // In about 20 real life seconds
+  const auto cameraSpeed = settings.get<float>(SettingsManager::Key::MoveSpeed).value();
+  // 20 seconds in ms
+  constexpr auto timeToCrossInMs = 20.0f * 1000.0f;
+
+  // 'Crossing the simulation' means from corner to corner
+  //
+  // (pretend this is square)
+  //
+  //             `newSize`
+  //  origin --> *_____
+  //             |\   |
+  //             | \  |
+  //             |  \ | `newSize`
+  //             |   \|
+  //             ------
+  // since `newSize` is distance from the origin
+  //
+  //                `newSize`
+  //                *_____
+  //                 \   |
+  // `newSize`*sq(2)  \  |
+  //                   \ | `newSize`
+  //                    \|
+  //
+  // so, distance to the origin from one corner is `newSize` * sq(2)
+  // we have to double that to get corner to corner
+  // so, the total diagonal distance is `newSize * std::sqrt(2.0f) * 2.0f`
+  return floor->getSize() * std::sqrt(2.0f) * 2.0f / (cameraSpeed * timeToCrossInMs);
+}
+
+void SceneWidget::applyAutoscaleCameraSpeed() {
+  if (autoscaleCameraMoveSpeed) {
+    const auto speedScale = getCameraAutoscale();
+    camera.setMoveSpeedSizeScale(speedScale);
+    arcCamera.moveSpeedSizeScale = speedScale;
+    return;
+  }
+
+  camera.setMoveSpeedSizeScale(1.0f);
+  arcCamera.moveSpeedSizeScale = 1.0f;
+}
+
 void SceneWidget::initializeGL() {
   if (!initializeOpenGLFunctions()) {
     std::cerr << "Failed OpenGL functions\n";
@@ -665,6 +710,8 @@ SceneWidget::SceneWidget(QWidget *parent, const Qt::WindowFlags &f) : QOpenGLWid
   }
 
   setResourcePath(resourceDirSetting.value());
+
+  applyAutoscaleCameraSpeed();
 }
 
 SceneWidget::~SceneWidget() {
@@ -686,11 +733,17 @@ void SceneWidget::setConfiguration(parser::GlobalConfiguration configuration) {
 
   // Don't resize beneath the default
   if (newSize > 100.0f) {
+    makeCurrent();
     renderer.resize(*floor, newSize + 50.0f); // Give the new size a bit of extra overrun
     renderer.resize(*coordinateGrid, newSize + 50.0f, settings.get<int>(SettingsManager::Key::RenderGridStep).value());
+    doneCurrent();
   }
 
   // time step handled by the MainWindow
+
+  const auto speedScale = getCameraAutoscale();
+  camera.setMoveSpeedSizeScale(speedScale);
+  arcCamera.moveSpeedSizeScale = speedScale;
 }
 
 void SceneWidget::reset() {
@@ -705,6 +758,9 @@ void SceneWidget::reset() {
   selectedNode.reset();
   fontManager.reset();
   simulationTime = 0.0;
+
+  camera.setMoveSpeedSizeScale(1.0f);
+  arcCamera.moveSpeedSizeScale = 1.0f;
 }
 
 void SceneWidget::add(const std::vector<parser::Area> &areaModels, const std::vector<parser::Building> &buildingModels,
@@ -981,6 +1037,17 @@ void SceneWidget::setLabelScale(float value) {
   labelScale = value;
 }
 
+void SceneWidget::setCameraMoveSpeed(const float value) {
+  camera.setMoveSpeed(value);
+  arcCamera.moveSpeed = value;
+  applyAutoscaleCameraSpeed();
+}
+
+void SceneWidget::setAutoscaleCameraMoveSpeed(const bool value) {
+  autoscaleCameraMoveSpeed = value;
+  applyAutoscaleCameraSpeed();
+}
+
 void SceneWidget::setSelectedNode(unsigned int nodeId) {
   if (nodes.find(nodeId) == nodes.end()) {
     std::cerr << "Node with ID: " << nodeId << " selected, but not found in `nodes`, ignoring!\n";
diff --git a/src/window/scene/SceneWidget.h b/src/window/scene/SceneWidget.h
index 8c366b0..30e6c46 100644
--- a/src/window/scene/SceneWidget.h
+++ b/src/window/scene/SceneWidget.h
@@ -111,6 +111,7 @@ class SceneWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_Core {
   // that OpenGL can accept
   std::array<float, 3> clearColorGl{static_cast<float>(clearColor.redF()), static_cast<float>(clearColor.greenF()),
                                     static_cast<float>(clearColor.blueF())};
+  bool autoscaleCameraMoveSpeed = settings.get<bool>(SettingsManager::Key::AutoScaleMoveSpeed).value();
 
   std::unique_ptr<PickingFramebuffer> pickingFbo;
 
@@ -154,6 +155,17 @@ class SceneWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_Core {
   void handleEvents();
   void handleUndoEvents();
 
+  /**
+   * Calculate the autoscale multiplier for
+   * the camera to cross the scenario in a
+   * fixed about of time
+   *
+   * @return
+   * The value to use for the camera move speed multiplier
+   */
+  float getCameraAutoscale() const;
+  void applyAutoscaleCameraSpeed();
+
 protected:
   void initializeGL() override;
   void paintGL() override;
@@ -337,6 +349,9 @@ class SceneWidget : public QOpenGLWidget, protected QOpenGLFunctions_3_3_Core {
    */
   void setLabelScale(float value);
 
+  void setCameraMoveSpeed(float value);
+  void setAutoscaleCameraMoveSpeed(bool value);
+
   void setSelectedNode(unsigned int nodeId);
   void clearSelectedNode();
 
diff --git a/src/window/settings/SettingsDialog.cpp b/src/window/settings/SettingsDialog.cpp
index c593d64..eac06d3 100644
--- a/src/window/settings/SettingsDialog.cpp
+++ b/src/window/settings/SettingsDialog.cpp
@@ -41,6 +41,8 @@ void SettingsDialog::loadSettings() {
   const auto cameraType = settings.get<SettingsManager::CameraType>(Key::RenderCameraType).value();
   ui.comboCameraType->setCurrentIndex(ui.comboCameraType->findData(static_cast<int>(cameraType)));
 
+  ui.checkBoxScaleMoveSpeed->setChecked(settings.get<bool>(Key::AutoScaleMoveSpeed).value());
+
   ui.checkBoxSkybox->setChecked(settings.get<bool>(Key::RenderSkybox).value());
   ui.checkBoxFloor->setChecked(settings.get<bool>(Key::RenderFloor).value());
 
@@ -171,6 +173,10 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) {
 
   loadSettings();
 
+  ui.sliderMoveSpeed->setEnabled(!ui.checkBoxScaleMoveSpeed->isChecked());
+  QObject::connect(ui.checkBoxScaleMoveSpeed, &QCheckBox::stateChanged, this,
+                   &SettingsDialog::autoscaleMoveSpeedToggled);
+
   QObject::connect(ui.buttonResetTheme, &QPushButton::clicked, this, &SettingsDialog::defaultWindowTheme);
   QObject::connect(ui.buttonResetMoveSpeed, &QPushButton::clicked, this, &SettingsDialog::defaultMoveSpeed);
   QObject::connect(ui.buttonResetKeyboardTurnSpeed, &QPushButton::clicked, this,
@@ -192,6 +198,8 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) {
   QObject::connect(ui.buttonResetSkybox, &QPushButton::clicked, this, &SettingsDialog::defaultEnableSkybox);
   QObject::connect(ui.buttonResetFloor, &QPushButton::clicked, this, &SettingsDialog::defaultEnableFloor);
   QObject::connect(ui.buttonResetCameraType, &QPushButton::clicked, this, &SettingsDialog::defaultCameraType);
+  QObject::connect(ui.buttonResetMoveSpeedScale, &QPushButton::clicked, this,
+                   &SettingsDialog::defaultAutoscaleMoveSpeed);
   QObject::connect(ui.buttonResetBackgroundColor, &QPushButton::clicked, this, &SettingsDialog::defaultBackgroundColor);
   QObject::connect(ui.buttonResetSamples, &QPushButton::clicked, this, &SettingsDialog::defaultSamples);
   QObject::connect(ui.buttonResetBuildingRender, &QPushButton::clicked, this, &SettingsDialog::defaultBuildingEffect);
@@ -256,6 +264,7 @@ void SettingsDialog::dialogueButtonClicked(QAbstractButton *button) {
     ui.buttonResetSkybox->click();
     ui.buttonResetFloor->click();
     ui.buttonResetCameraType->click();
+    ui.buttonResetMoveSpeedScale->click();
     ui.buttonResetBackgroundColor->click();
     ui.buttonResetSamples->click();
     ui.buttonResetBuildingRender->click();
@@ -286,6 +295,12 @@ void SettingsDialog::dialogueButtonClicked(QAbstractButton *button) {
       emit cameraTypeChanged(static_cast<int>(cameraType));
     }
 
+    const auto autoscaleMoveSpeed = settings.get<bool>(Key::AutoScaleMoveSpeed).value();
+    if (autoscaleMoveSpeed != ui.checkBoxScaleMoveSpeed->isChecked()) {
+      settings.set(Key::AutoScaleMoveSpeed, autoscaleMoveSpeed);
+      emit autoscaleMoveSpeedChanged(ui.checkBoxScaleMoveSpeed->isChecked());
+    }
+
     const auto moveSpeed = static_cast<float>(ui.sliderMoveSpeed->value()) / moveSpeedScale;
     settings.set(Key::MoveSpeed, moveSpeed);
     emit moveSpeedChanged(moveSpeed);
@@ -504,6 +519,14 @@ void SettingsDialog::dialogueButtonClicked(QAbstractButton *button) {
   }
 }
 
+void SettingsDialog::autoscaleMoveSpeedToggled(const int state) {
+  ui.sliderMoveSpeed->setEnabled(state != Qt::CheckState::Checked);
+  if (state == Qt::CheckState::Checked) {
+    ui.sliderMoveSpeed->setValue(
+        static_cast<int>(*settings.get<float>(SettingsManager::Key::MoveSpeed) * moveSpeedScale));
+  }
+}
+
 void SettingsDialog::defaultWindowTheme() {
   const auto defaultTheme = settings.getDefault<SettingsManager::WindowTheme>(SettingsManager::Key::WindowTheme);
   ui.comboTheme->setCurrentIndex(ui.comboTheme->findData(static_cast<int>(defaultTheme)));
@@ -553,6 +576,9 @@ void SettingsDialog::defaultCameraType() {
       settings.getDefault<SettingsManager::CameraType>(SettingsManager::Key::RenderCameraType);
   ui.comboCameraType->setCurrentIndex(ui.comboCameraType->findData(static_cast<int>(defaultCameraType)));
 }
+void SettingsDialog::defaultAutoscaleMoveSpeed() {
+  ui.checkBoxScaleMoveSpeed->setChecked(settings.getDefault<bool>(SettingsManager::Key::AutoScaleMoveSpeed));
+}
 
 void SettingsDialog::defaultEnableFloor() {
   ui.checkBoxFloor->setChecked(settings.getDefault<bool>(SettingsManager::Key::RenderFloor));
diff --git a/src/window/settings/SettingsDialog.h b/src/window/settings/SettingsDialog.h
index 21e991f..b635874 100644
--- a/src/window/settings/SettingsDialog.h
+++ b/src/window/settings/SettingsDialog.h
@@ -99,6 +99,8 @@ class SettingsDialog : public QDialog {
    */
   void dialogueButtonClicked(QAbstractButton *button);
 
+  void autoscaleMoveSpeedToggled(int state);
+
   /**
    * Set the Window Theme combobox to the default value
    */
@@ -149,6 +151,8 @@ class SettingsDialog : public QDialog {
    */
   void defaultCameraType();
 
+  void defaultAutoscaleMoveSpeed();
+
   /**
    * Set the Floor checkbox to the default value
    */
@@ -365,6 +369,15 @@ class SettingsDialog : public QDialog {
    */
   void cameraTypeChanged(int value);
 
+  /**
+   * Signal emitted when the user changes the Autoscale Move Speed toggle.
+   *
+   * @param value
+   * True if the user wants to use Autoscaling for movement speed
+   * false otherwise
+   */
+  void autoscaleMoveSpeedChanged(bool value);
+
   /**
    * Signal emitted when the user changes the
    * Floor render state
diff --git a/src/window/settings/SettingsDialog.ui b/src/window/settings/SettingsDialog.ui
index ac72ee6..3546a58 100644
--- a/src/window/settings/SettingsDialog.ui
+++ b/src/window/settings/SettingsDialog.ui
@@ -46,135 +46,32 @@
         <x>0</x>
         <y>0</y>
         <width>531</width>
-        <height>1168</height>
+        <height>1200</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout">
-       <item row="17" column="12">
-        <widget class="QLabel" name="labelCharts">
-         <property name="font">
-          <font>
-           <pointsize>16</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Charts</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="13" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyTurnLeft">
-         <property name="keySequence">
-          <string>Q</string>
-         </property>
-        </widget>
-       </item>
-       <item row="12" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyRight">
-         <property name="keySequence">
-          <string>D</string>
-         </property>
-        </widget>
-       </item>
-       <item row="27" column="0">
-        <widget class="QLabel" name="labelRenderBuildingOutlines">
-         <property name="text">
-          <string>Show Building Outlines</string>
-         </property>
-        </widget>
-       </item>
-       <item row="21" column="13">
-        <widget class="QPushButton" name="buttonResetSamples">
-         <property name="text">
-          <string>Default</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="13">
-        <widget class="QPushButton" name="buttonResetKeyboardTurnSpeed">
+       <item row="8" column="12">
+        <widget class="QPushButton" name="buttonResetMouseTurnSpeed">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="12">
-        <widget class="QSlider" name="sliderMouseTurnSpeed">
-         <property name="maximum">
-          <number>20</number>
-         </property>
-         <property name="pageStep">
-          <number>5</number>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="18" column="12">
-        <widget class="QComboBox" name="comboSortOrder"/>
-       </item>
-       <item row="41" column="12">
-        <widget class="QLineEdit" name="lineEditResource">
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="29" column="0">
-        <widget class="QLabel" name="labelGridSize">
+       <item row="27" column="0">
+        <widget class="QLabel" name="labelRenderBuildings">
          <property name="text">
-          <string>Grid Step Size</string>
+          <string>Building Effect</string>
          </property>
         </widget>
        </item>
-       <item row="27" column="12">
-        <layout class="QHBoxLayout" name="layoutBuildingOutlines">
-         <item>
-          <spacer name="hsBuildingOutlinesLeft">
-           <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="checkBoxBuildingOutlines">
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="hsBuildingOutlinesRight">
-           <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="16" column="0" colspan="2">
-        <widget class="QLabel" name="labelDown">
+       <item row="2" column="0">
+        <widget class="QLabel" name="labelTheme">
          <property name="text">
-          <string>Down</string>
+          <string>Theme</string>
          </property>
         </widget>
        </item>
-       <item row="28" column="12">
+       <item row="29" column="11">
         <layout class="QHBoxLayout" name="layoutShowGrid">
          <item>
           <spacer name="hsGridLeft">
@@ -214,146 +111,72 @@
          </item>
         </layout>
        </item>
-       <item row="0" column="12">
-        <widget class="QLabel" name="labelWindow">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>16</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Window</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="12" column="0" colspan="2">
-        <widget class="QLabel" name="labelRight">
-         <property name="text">
-          <string>Right</string>
-         </property>
-        </widget>
-       </item>
-       <item row="18" column="0">
-        <widget class="QLabel" name="labelSortOrder">
+       <item row="26" column="0">
+        <widget class="QLabel" name="labelBackgroundColor">
          <property name="text">
-          <string>Sort Order</string>
+          <string>Background Color</string>
          </property>
         </widget>
        </item>
-       <item row="26" column="0">
-        <widget class="QLabel" name="labelRenderBuildings">
+       <item row="34" column="0">
+        <widget class="QLabel" name="labelLabelScale">
          <property name="text">
-          <string>Building Effect</string>
+          <string>Label Size</string>
          </property>
         </widget>
        </item>
-       <item row="31" column="13">
-        <widget class="QPushButton" name="buttonResetTrailLength">
+       <item row="2" column="12">
+        <widget class="QPushButton" name="buttonResetTheme">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="21" column="12">
-        <widget class="QComboBox" name="comboSamples"/>
-       </item>
-       <item row="11" column="0" colspan="2">
-        <widget class="QLabel" name="labelLeft">
+       <item row="33" column="12">
+        <widget class="QPushButton" name="buttonResetShowLabels">
          <property name="text">
-          <string>Left</string>
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="25" column="12">
-        <layout class="QHBoxLayout" name="layoutBackgroundColor">
-         <item>
-          <widget class="QComboBox" name="comboBackgroundColor"/>
-         </item>
-         <item>
-          <widget class="QPushButton" name="buttonSetCustomBackgroundColor">
-           <property name="text">
-            <string>Set Custom</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="31" column="12">
-        <widget class="QSlider" name="sliderTrailLength">
+       <item row="9" column="11">
+        <widget class="QSlider" name="sliderFieldOfView">
          <property name="minimum">
-          <number>10</number>
+          <number>30</number>
          </property>
          <property name="maximum">
-          <number>8192</number>
+          <number>90</number>
          </property>
          <property name="value">
-          <number>100</number>
+          <number>45</number>
          </property>
          <property name="orientation">
           <enum>Qt::Orientation::Horizontal</enum>
          </property>
         </widget>
        </item>
-       <item row="35" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyPlay">
-         <property name="keySequence">
-          <string>X</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="labelTheme">
-         <property name="text">
-          <string>Theme</string>
-         </property>
-        </widget>
-       </item>
-       <item row="29" column="13">
-        <widget class="QPushButton" name="buttonResetGridSize">
+       <item row="6" column="12">
+        <widget class="QPushButton" name="buttonResetMoveSpeed">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="19" column="12">
-        <widget class="QLabel" name="labelGraphics">
-         <property name="font">
-          <font>
-           <pointsize>16</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Graphics</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="33" column="13">
-        <widget class="QPushButton" name="buttonResetLabelScale">
+       <item row="32" column="12">
+        <widget class="QPushButton" name="buttonResetTrailLength">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyBackward">
-         <property name="keySequence">
-          <string>S</string>
+       <item row="16" column="0" colspan="2">
+        <widget class="QLabel" name="labelUp">
+         <property name="text">
+          <string>Up</string>
          </property>
         </widget>
        </item>
-       <item row="34" column="12">
+       <item row="35" column="11">
         <widget class="QLabel" name="labelPlayback">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -380,206 +203,121 @@
          </property>
         </widget>
        </item>
-       <item row="33" column="12">
-        <widget class="QSlider" name="sliderLabelScale">
-         <property name="minimum">
-          <number>1</number>
+       <item row="3" column="10" colspan="2">
+        <widget class="QLabel" name="labelCamera">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="maximum">
-          <number>100</number>
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+          </font>
          </property>
-         <property name="value">
-          <number>50</number>
+         <property name="text">
+          <string>Camera</string>
          </property>
-         <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+         <property name="alignment">
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
-       <item row="10" column="13">
-        <widget class="QPushButton" name="buttonResetBackward">
-         <property name="text">
-          <string>Default</string>
-         </property>
-        </widget>
+       <item row="26" column="11">
+        <layout class="QHBoxLayout" name="layoutBackgroundColor">
+         <item>
+          <widget class="QComboBox" name="comboBackgroundColor"/>
+         </item>
+         <item>
+          <widget class="QPushButton" name="buttonSetCustomBackgroundColor">
+           <property name="text">
+            <string>Set Custom</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
-       <item row="15" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyUp">
+       <item row="36" column="11">
+        <widget class="SingleKeySequenceEdit" name="keyPlay">
          <property name="keySequence">
-          <string>Z</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="13">
-        <widget class="QPushButton" name="buttonResetMoveSpeed">
-         <property name="text">
-          <string>Default</string>
+          <string>X</string>
          </property>
         </widget>
        </item>
-       <item row="41" column="0" colspan="3">
-        <widget class="QLabel" name="label">
+       <item row="14" column="0" colspan="2">
+        <widget class="QLabel" name="labelTurnLeft">
          <property name="text">
-          <string>Resource Directory</string>
+          <string>Turn Left</string>
          </property>
         </widget>
        </item>
-       <item row="27" column="13">
-        <widget class="QPushButton" name="buttonResetBuildingOutlines">
-         <property name="text">
-          <string>Default</string>
+       <item row="34" column="11">
+        <widget class="QSlider" name="sliderLabelScale">
+         <property name="minimum">
+          <number>1</number>
          </property>
-        </widget>
-       </item>
-       <item row="14" column="0" colspan="2">
-        <widget class="QLabel" name="labelTurnRight">
-         <property name="text">
-          <string>Turn Right</string>
+         <property name="maximum">
+          <number>100</number>
          </property>
-        </widget>
-       </item>
-       <item row="8" column="0" colspan="4">
-        <widget class="QLabel" name="labelFieldOfView">
-         <property name="text">
-          <string>Field of View</string>
+         <property name="value">
+          <number>50</number>
          </property>
-        </widget>
-       </item>
-       <item row="5" column="0" colspan="4">
-        <widget class="QLabel" name="labelMoveSpeed">
-         <property name="text">
-          <string>Move Speed</string>
+         <property name="orientation">
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
         </widget>
        </item>
-       <item row="26" column="13">
+       <item row="27" column="12">
         <widget class="QPushButton" name="buttonResetBuildingRender">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="15" column="13">
-        <widget class="QPushButton" name="buttonResetUp">
-         <property name="text">
-          <string>Default</string>
-         </property>
-        </widget>
-       </item>
-       <item row="30" column="13">
-        <widget class="QPushButton" name="buttonResetTrails">
+       <item row="28" column="12">
+        <widget class="QPushButton" name="buttonResetBuildingOutlines">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="15" column="0" colspan="2">
-        <widget class="QLabel" name="labelUp">
-         <property name="text">
-          <string>Up</string>
-         </property>
-        </widget>
-       </item>
-       <item row="35" column="0">
-        <widget class="QLabel" name="labelPlay">
-         <property name="text">
-          <string>Play/Pause</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="13">
-        <widget class="QPushButton" name="buttonResetFieldOfView">
+       <item row="6" column="0" colspan="4">
+        <widget class="QLabel" name="labelMoveSpeed">
          <property name="text">
-          <string>Default</string>
+          <string>Move Speed</string>
          </property>
         </widget>
        </item>
-       <item row="26" column="12">
-        <widget class="QComboBox" name="comboBuildingRender"/>
-       </item>
-       <item row="33" column="0">
-        <widget class="QLabel" name="labelLabelScale">
+       <item row="22" column="0">
+        <widget class="QLabel" name="labelSamples">
          <property name="text">
-          <string>Label Size</string>
-         </property>
-        </widget>
-       </item>
-       <item row="23" column="12">
-        <layout class="QHBoxLayout" name="layoutFLoor">
-         <item>
-          <spacer name="hsFloorLeft">
-           <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="checkBoxFloor">
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="hsFloorRight">
-           <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="2" column="12">
-        <widget class="QComboBox" name="comboTheme"/>
-       </item>
-       <item row="14" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyTurnRight">
-         <property name="keySequence">
-          <string>E</string>
+          <string>Samples (MSAA)</string>
          </property>
         </widget>
        </item>
-       <item row="12" column="13">
-        <widget class="QPushButton" name="buttonResetRight">
-         <property name="text">
-          <string>Default</string>
+       <item row="0" column="11">
+        <widget class="QLabel" name="labelWindow">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-        </widget>
-       </item>
-       <item row="36" column="0">
-        <widget class="QLabel" name="labelTimeStep">
-         <property name="text">
-          <string>Time Step Preference</string>
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+          </font>
          </property>
-        </widget>
-       </item>
-       <item row="7" column="13">
-        <widget class="QPushButton" name="buttonResetMouseTurnSpeed">
          <property name="text">
-          <string>Default</string>
+          <string>Window</string>
          </property>
-        </widget>
-       </item>
-       <item row="13" column="13">
-        <widget class="QPushButton" name="buttonResetLeftTurn">
-         <property name="text">
-          <string>Default</string>
+         <property name="alignment">
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
-       <item row="36" column="12">
+       <item row="37" column="11">
         <layout class="QHBoxLayout" name="layoutTimeStep">
          <item>
           <widget class="QSpinBox" name="spinTimeStep">
@@ -602,27 +340,10 @@
          </item>
         </layout>
        </item>
-       <item row="9" column="0" colspan="2">
-        <widget class="QLabel" name="labelForward">
-         <property name="text">
-          <string>Forward</string>
-         </property>
-        </widget>
-       </item>
-       <item row="13" column="0" colspan="2">
-        <widget class="QLabel" name="labelTurnLeft">
-         <property name="text">
-          <string>Turn Left</string>
-         </property>
-        </widget>
-       </item>
-       <item row="24" column="12">
-        <layout class="QHBoxLayout" name="layoutSkybox" stretch="0,0,0">
-         <property name="topMargin">
-          <number>0</number>
-         </property>
+       <item row="28" column="11">
+        <layout class="QHBoxLayout" name="layoutBuildingOutlines">
          <item>
-          <spacer name="hsSkyboxLeft">
+          <spacer name="hsBuildingOutlinesLeft">
            <property name="orientation">
             <enum>Qt::Orientation::Horizontal</enum>
            </property>
@@ -635,29 +356,14 @@
           </spacer>
          </item>
          <item>
-          <widget class="QCheckBox" name="checkBoxSkybox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="baseSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true"/>
-           </property>
+          <widget class="QCheckBox" name="checkBoxBuildingOutlines">
            <property name="text">
             <string/>
            </property>
           </widget>
          </item>
          <item>
-          <spacer name="hsSkyboxRight">
+          <spacer name="hsBuildingOutlinesRight">
            <property name="orientation">
             <enum>Qt::Orientation::Horizontal</enum>
            </property>
@@ -671,163 +377,201 @@
          </item>
         </layout>
        </item>
-       <item row="32" column="13">
-        <widget class="QPushButton" name="buttonResetShowLabels">
+       <item row="25" column="0">
+        <widget class="QLabel" name="labelSkybox">
          <property name="text">
-          <string>Default</string>
+          <string>SkyBox</string>
          </property>
         </widget>
        </item>
-       <item row="11" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyLeft">
-         <property name="keySequence">
-          <string>A</string>
+       <item row="32" column="0">
+        <widget class="QLabel" name="labelMotionTrailLength">
+         <property name="text">
+          <string>Motion Trail Length</string>
          </property>
         </widget>
        </item>
-       <item row="35" column="13">
-        <widget class="QPushButton" name="buttonResetPlay">
+       <item row="19" column="11">
+        <widget class="QComboBox" name="comboSortOrder"/>
+       </item>
+       <item row="7" column="12">
+        <widget class="QPushButton" name="buttonResetKeyboardTurnSpeed">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="32" column="0">
-        <widget class="QLabel" name="labelShowLabels">
+       <item row="17" column="0" colspan="2">
+        <widget class="QLabel" name="labelDown">
          <property name="text">
-          <string>Show Labels</string>
+          <string>Down</string>
          </property>
         </widget>
        </item>
-       <item row="21" column="0">
-        <widget class="QLabel" name="labelSamples">
+       <item row="9" column="0" colspan="4">
+        <widget class="QLabel" name="labelFieldOfView">
          <property name="text">
-          <string>Samples (MSAA)</string>
+          <string>Field of View</string>
          </property>
         </widget>
        </item>
-       <item row="24" column="0">
-        <widget class="QLabel" name="labelSkybox">
-         <property name="text">
-          <string>SkyBox</string>
+       <item row="32" column="11">
+        <widget class="QSlider" name="sliderTrailLength">
+         <property name="minimum">
+          <number>10</number>
          </property>
-        </widget>
-       </item>
-       <item row="40" column="12">
-        <widget class="QLabel" name="labelResources">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="font">
-          <font>
-           <pointsize>16</pointsize>
-          </font>
-         </property>
-         <property name="text">
-          <string>Resources</string>
+         <property name="maximum">
+          <number>8192</number>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignCenter</set>
+         <property name="value">
+          <number>100</number>
          </property>
-        </widget>
-       </item>
-       <item row="14" column="13">
-        <widget class="QPushButton" name="buttonResetRightTurn">
-         <property name="text">
-          <string>Default</string>
+         <property name="orientation">
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
         </widget>
        </item>
-       <item row="28" column="13">
-        <widget class="QPushButton" name="buttonResetShowGrid">
+       <item row="25" column="12">
+        <widget class="QPushButton" name="buttonResetSkybox">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="25" column="0">
-        <widget class="QLabel" name="labelBackgroundColor">
-         <property name="text">
-          <string>Background Color</string>
-         </property>
-        </widget>
+       <item row="2" column="11">
+        <widget class="QComboBox" name="comboTheme"/>
        </item>
-       <item row="30" column="0">
-        <widget class="QLabel" name="labelShowTrails">
-         <property name="text">
-          <string>Show Motion Trails</string>
+       <item row="14" column="11">
+        <widget class="SingleKeySequenceEdit" name="keyTurnLeft">
+         <property name="keySequence">
+          <string>Q</string>
          </property>
         </widget>
        </item>
-       <item row="18" column="13">
-        <widget class="QPushButton" name="buttonResetSortOrder">
+       <item row="37" column="12">
+        <widget class="QPushButton" name="buttonResetTimeStep">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="28" column="0">
-        <widget class="QLabel" name="labelShowGrid">
+       <item row="18" column="11">
+        <widget class="QLabel" name="labelCharts">
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+          </font>
+         </property>
          <property name="text">
-          <string>Show Grid</string>
+          <string>Charts</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
-       <item row="36" column="13">
-        <widget class="QPushButton" name="buttonResetTimeStep">
+       <item row="22" column="11">
+        <widget class="QComboBox" name="comboSamples"/>
+       </item>
+       <item row="29" column="12">
+        <widget class="QPushButton" name="buttonResetShowGrid">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyForward">
+       <item row="17" column="11">
+        <widget class="SingleKeySequenceEdit" name="keyDown">
          <property name="keySequence">
-          <string>W</string>
+          <string>X</string>
          </property>
         </widget>
        </item>
-       <item row="16" column="13">
-        <widget class="QPushButton" name="buttonResetDown">
-         <property name="text">
-          <string>Default</string>
+       <item row="8" column="11">
+        <widget class="QSlider" name="sliderMouseTurnSpeed">
+         <property name="maximum">
+          <number>20</number>
          </property>
-        </widget>
-       </item>
-       <item row="23" column="0">
-        <widget class="QLabel" name="labelFloor">
-         <property name="text">
-          <string>Floor</string>
+         <property name="pageStep">
+          <number>5</number>
+         </property>
+         <property name="orientation">
+          <enum>Qt::Orientation::Horizontal</enum>
          </property>
         </widget>
        </item>
        <item row="30" column="12">
-        <widget class="QComboBox" name="comboMotionTrailRender"/>
-       </item>
-       <item row="41" column="13">
-        <widget class="QPushButton" name="buttonResource">
+        <widget class="QPushButton" name="buttonResetGridSize">
          <property name="text">
-          <string>Browse</string>
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="13">
-        <widget class="QPushButton" name="buttonResetTheme">
+       <item row="41" column="11">
+        <widget class="QLabel" name="labelResources">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+          </font>
+         </property>
          <property name="text">
-          <string>Default</string>
+          <string>Resources</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
-       <item row="5" column="12">
+       <item row="24" column="11">
+        <layout class="QHBoxLayout" name="layoutFLoor">
+         <item>
+          <spacer name="hsFloorLeft">
+           <property name="orientation">
+            <enum>Qt::Orientation::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="checkBoxFloor">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="hsFloorRight">
+           <property name="orientation">
+            <enum>Qt::Orientation::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="6" column="11">
         <widget class="QSlider" name="sliderMoveSpeed">
          <property name="minimum">
           <number>1</number>
@@ -852,106 +596,304 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0" colspan="4">
-        <widget class="QLabel" name="labelKeyboardTurnSpeed">
+       <item row="4" column="12">
+        <widget class="QPushButton" name="buttonResetCameraType">
          <property name="text">
-          <string>Keyboard Turn Speed</string>
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="8" column="12">
-        <widget class="QSlider" name="sliderFieldOfView">
-         <property name="minimum">
-          <number>30</number>
-         </property>
-         <property name="maximum">
-          <number>90</number>
+       <item row="5" column="0">
+        <widget class="QLabel" name="labelMoveSpeedScale">
+         <property name="text">
+          <string>Autoscale Move Speed</string>
          </property>
-         <property name="value">
-          <number>45</number>
+        </widget>
+       </item>
+       <item row="16" column="11">
+        <widget class="SingleKeySequenceEdit" name="keyUp">
+         <property name="keySequence">
+          <string>Z</string>
          </property>
-         <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+        </widget>
+       </item>
+       <item row="12" column="11">
+        <widget class="SingleKeySequenceEdit" name="keyLeft">
+         <property name="keySequence">
+          <string>A</string>
          </property>
         </widget>
        </item>
-       <item row="31" column="0">
-        <widget class="QLabel" name="labelMotionTrailLength">
+       <item row="10" column="0" colspan="2">
+        <widget class="QLabel" name="labelForward">
          <property name="text">
-          <string>Motion Trail Length</string>
+          <string>Forward</string>
          </property>
         </widget>
        </item>
-       <item row="24" column="13">
-        <widget class="QPushButton" name="buttonResetSkybox">
+       <item row="15" column="0" colspan="2">
+        <widget class="QLabel" name="labelTurnRight">
          <property name="text">
-          <string>Default</string>
+          <string>Turn Right</string>
          </property>
         </widget>
        </item>
-       <item row="29" column="12">
-        <widget class="QComboBox" name="comboGridSize"/>
-       </item>
-       <item row="7" column="0" colspan="4">
-        <widget class="QLabel" name="labelMouseTurnSpeed">
+       <item row="36" column="0">
+        <widget class="QLabel" name="labelPlay">
          <property name="text">
-          <string>Mouse Turn Speed</string>
+          <string>Play/Pause</string>
          </property>
         </widget>
        </item>
-       <item row="16" column="12">
-        <widget class="SingleKeySequenceEdit" name="keyDown">
-         <property name="keySequence">
-          <string>X</string>
+       <item row="12" column="12">
+        <widget class="QPushButton" name="buttonResetLeft">
+         <property name="text">
+          <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="13">
-        <widget class="QPushButton" name="buttonResetForward">
+       <item row="17" column="12">
+        <widget class="QPushButton" name="buttonResetDown">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="25" column="13">
-        <widget class="QPushButton" name="buttonResetBackgroundColor">
+       <item row="24" column="0">
+        <widget class="QLabel" name="labelFloor">
          <property name="text">
-          <string>Default</string>
+          <string>Floor</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="11" colspan="2">
-        <widget class="QLabel" name="labelCamera">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+       <item row="33" column="11">
+        <widget class="QComboBox" name="comboLabelRender"/>
+       </item>
+       <item row="10" column="11">
+        <widget class="SingleKeySequenceEdit" name="keyForward">
+         <property name="keySequence">
+          <string>W</string>
          </property>
-         <property name="font">
-          <font>
-           <pointsize>16</pointsize>
-          </font>
+        </widget>
+       </item>
+       <item row="19" column="0">
+        <widget class="QLabel" name="labelSortOrder">
+         <property name="text">
+          <string>Sort Order</string>
          </property>
+        </widget>
+       </item>
+       <item row="15" column="12">
+        <widget class="QPushButton" name="buttonResetRightTurn">
          <property name="text">
-          <string>Camera</string>
+          <string>Default</string>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignmentFlag::AlignCenter</set>
+        </widget>
+       </item>
+       <item row="13" column="11">
+        <widget class="SingleKeySequenceEdit" name="keyRight">
+         <property name="keySequence">
+          <string>D</string>
          </property>
         </widget>
        </item>
-       <item row="23" column="13">
-        <widget class="QPushButton" name="buttonResetFloor">
+       <item row="10" column="12">
+        <widget class="QPushButton" name="buttonResetForward">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
-       <item row="6" column="12">
-        <widget class="QSlider" name="sliderKeyboardTurnSpeed">
-         <property name="maximum">
-          <number>20</number>
+       <item row="15" column="11">
+        <widget class="SingleKeySequenceEdit" name="keyTurnRight">
+         <property name="keySequence">
+          <string>E</string>
+         </property>
+        </widget>
+       </item>
+       <item row="14" column="12">
+        <widget class="QPushButton" name="buttonResetLeftTurn">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="13" column="12">
+        <widget class="QPushButton" name="buttonResetRight">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="31" column="12">
+        <widget class="QPushButton" name="buttonResetTrails">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="42" column="12">
+        <widget class="QPushButton" name="buttonResource">
+         <property name="text">
+          <string>Browse</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0" colspan="4">
+        <widget class="QLabel" name="labelKeyboardTurnSpeed">
+         <property name="text">
+          <string>Keyboard Turn Speed</string>
+         </property>
+        </widget>
+       </item>
+       <item row="30" column="11">
+        <widget class="QComboBox" name="comboGridSize"/>
+       </item>
+       <item row="4" column="11">
+        <widget class="QComboBox" name="comboCameraType"/>
+       </item>
+       <item row="37" column="0">
+        <widget class="QLabel" name="labelTimeStep">
+         <property name="text">
+          <string>Time Step Preference</string>
+         </property>
+        </widget>
+       </item>
+       <item row="22" column="12">
+        <widget class="QPushButton" name="buttonResetSamples">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="12">
+        <widget class="QPushButton" name="buttonResetBackward">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="19" column="12">
+        <widget class="QPushButton" name="buttonResetSortOrder">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="29" column="0">
+        <widget class="QLabel" name="labelShowGrid">
+         <property name="text">
+          <string>Show Grid</string>
+         </property>
+        </widget>
+       </item>
+       <item row="25" column="11">
+        <layout class="QHBoxLayout" name="layoutSkybox" stretch="0,0,0">
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <spacer name="hsSkyboxLeft">
+           <property name="orientation">
+            <enum>Qt::Orientation::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="checkBoxSkybox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="baseSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="styleSheet">
+            <string notr="true"/>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="hsSkyboxRight">
+           <property name="orientation">
+            <enum>Qt::Orientation::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="16" column="12">
+        <widget class="QPushButton" name="buttonResetUp">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="27" column="11">
+        <widget class="QComboBox" name="comboBuildingRender"/>
+       </item>
+       <item row="36" column="12">
+        <widget class="QPushButton" name="buttonResetPlay">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="31" column="11">
+        <widget class="QComboBox" name="comboMotionTrailRender"/>
+       </item>
+       <item row="42" column="11">
+        <widget class="QLineEdit" name="lineEditResource">
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="24" column="12">
+        <widget class="QPushButton" name="buttonResetFloor">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="30" column="0">
+        <widget class="QLabel" name="labelGridSize">
+         <property name="text">
+          <string>Grid Step Size</string>
+         </property>
+        </widget>
+       </item>
+       <item row="34" column="12">
+        <widget class="QPushButton" name="buttonResetLabelScale">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="11">
+        <widget class="QSlider" name="sliderKeyboardTurnSpeed">
+         <property name="maximum">
+          <number>20</number>
          </property>
          <property name="pageStep">
           <number>5</number>
@@ -964,23 +906,76 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="0" colspan="2">
-        <widget class="QLabel" name="labelBackward">
+       <item row="33" column="0">
+        <widget class="QLabel" name="labelShowLabels">
          <property name="text">
-          <string>Backward</string>
+          <string>Show Labels</string>
          </property>
         </widget>
        </item>
-       <item row="32" column="12">
-        <widget class="QComboBox" name="comboLabelRender"/>
+       <item row="26" column="12">
+        <widget class="QPushButton" name="buttonResetBackgroundColor">
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </widget>
        </item>
-       <item row="11" column="13">
-        <widget class="QPushButton" name="buttonResetLeft">
+       <item row="9" column="12">
+        <widget class="QPushButton" name="buttonResetFieldOfView">
          <property name="text">
           <string>Default</string>
          </property>
         </widget>
        </item>
+       <item row="31" column="0">
+        <widget class="QLabel" name="labelShowTrails">
+         <property name="text">
+          <string>Show Motion Trails</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0" colspan="4">
+        <widget class="QLabel" name="labelMouseTurnSpeed">
+         <property name="text">
+          <string>Mouse Turn Speed</string>
+         </property>
+        </widget>
+       </item>
+       <item row="42" column="0" colspan="3">
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Resource Directory</string>
+         </property>
+        </widget>
+       </item>
+       <item row="28" column="0">
+        <widget class="QLabel" name="labelRenderBuildingOutlines">
+         <property name="text">
+          <string>Show Building Outlines</string>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="11">
+        <widget class="SingleKeySequenceEdit" name="keyBackward">
+         <property name="keySequence">
+          <string>S</string>
+         </property>
+        </widget>
+       </item>
+       <item row="12" column="0" colspan="2">
+        <widget class="QLabel" name="labelLeft">
+         <property name="text">
+          <string>Left</string>
+         </property>
+        </widget>
+       </item>
+       <item row="11" column="0" colspan="2">
+        <widget class="QLabel" name="labelBackward">
+         <property name="text">
+          <string>Backward</string>
+         </property>
+        </widget>
+       </item>
        <item row="4" column="0">
         <widget class="QLabel" name="labelCameraType">
          <property name="text">
@@ -988,11 +983,67 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="12">
-        <widget class="QComboBox" name="comboCameraType"/>
+       <item row="13" column="0" colspan="2">
+        <widget class="QLabel" name="labelRight">
+         <property name="text">
+          <string>Right</string>
+         </property>
+        </widget>
        </item>
-       <item row="4" column="13">
-        <widget class="QPushButton" name="buttonResetCameraType">
+       <item row="20" column="11">
+        <widget class="QLabel" name="labelGraphics">
+         <property name="font">
+          <font>
+           <pointsize>16</pointsize>
+          </font>
+         </property>
+         <property name="text">
+          <string>Graphics</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignmentFlag::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="11">
+        <layout class="QHBoxLayout" name="layoutScaleMoveSpeed">
+         <item>
+          <spacer name="hsScaleMoveSpeedLeft">
+           <property name="orientation">
+            <enum>Qt::Orientation::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="checkBoxScaleMoveSpeed">
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="hsScaleMoveSpeedRight">
+           <property name="orientation">
+            <enum>Qt::Orientation::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="5" column="12">
+        <widget class="QPushButton" name="buttonResetMoveSpeedScale">
          <property name="text">
           <string>Default</string>
          </property>