diff --git a/Images/Icons/style-01/dashboard.png b/Images/Icons/style-01/dashboard.png
new file mode 100644
index 000000000..0a6ffaf30
Binary files /dev/null and b/Images/Icons/style-01/dashboard.png differ
diff --git a/Images/Icons/style-01/toggle-auto-scale-auto-max.png b/Images/Icons/style-01/toggle-auto-scale-auto-max.png
new file mode 100644
index 000000000..2267a3d47
Binary files /dev/null and b/Images/Icons/style-01/toggle-auto-scale-auto-max.png differ
diff --git a/Images/Icons/style-01/toggle-auto-scale-auto-min-max.png b/Images/Icons/style-01/toggle-auto-scale-auto-min-max.png
new file mode 100644
index 000000000..c216ce3d5
Binary files /dev/null and b/Images/Icons/style-01/toggle-auto-scale-auto-min-max.png differ
diff --git a/Images/Icons/style-01/toggle-auto-scale-auto-min.png b/Images/Icons/style-01/toggle-auto-scale-auto-min.png
new file mode 100644
index 000000000..812857b1c
Binary files /dev/null and b/Images/Icons/style-01/toggle-auto-scale-auto-min.png differ
diff --git a/Images/Icons/style-01/toggle-auto-scale-manual.png b/Images/Icons/style-01/toggle-auto-scale-manual.png
new file mode 100644
index 000000000..93f506073
Binary files /dev/null and b/Images/Icons/style-01/toggle-auto-scale-manual.png differ
diff --git a/Images/Icons/style-01/toggle-auto-time-scale-auto-max.png b/Images/Icons/style-01/toggle-auto-time-scale-auto-max.png
new file mode 100644
index 000000000..8e99021c7
Binary files /dev/null and b/Images/Icons/style-01/toggle-auto-time-scale-auto-max.png differ
diff --git a/Images/Icons/style-01/toggle-auto-time-scale-auto-min-max.png b/Images/Icons/style-01/toggle-auto-time-scale-auto-min-max.png
new file mode 100644
index 000000000..69b2d197f
Binary files /dev/null and b/Images/Icons/style-01/toggle-auto-time-scale-auto-min-max.png differ
diff --git a/Images/Icons/style-01/toggle-auto-time-scale-auto-min.png b/Images/Icons/style-01/toggle-auto-time-scale-auto-min.png
new file mode 100644
index 000000000..5882a1ca3
Binary files /dev/null and b/Images/Icons/style-01/toggle-auto-time-scale-auto-min.png differ
diff --git a/Images/Icons/style-01/toggle-auto-time-scale-manual.png b/Images/Icons/style-01/toggle-auto-time-scale-manual.png
new file mode 100644
index 000000000..b45b08be9
Binary files /dev/null and b/Images/Icons/style-01/toggle-auto-time-scale-manual.png differ
diff --git a/Images/Icons/style-01/toggle-panel-off.png b/Images/Icons/style-01/toggle-panel-off.png
new file mode 100644
index 000000000..032a33409
Binary files /dev/null and b/Images/Icons/style-01/toggle-panel-off.png differ
diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js
index 72a5cc6be..09987f9c4 100644
--- a/Scripts/AppLoader.js
+++ b/Scripts/AppLoader.js
@@ -26,7 +26,7 @@ function newAppLoader() {
             modulesArray = ['UserEcosystem.js']
        
             modulesArray = modulesArray.concat([
-                'ChartsSpace/Viewport.js',
+                'ChartingSpace/Viewport.js',
 
                 'Globals.js',
                 'Ecosystem.js',
@@ -34,25 +34,25 @@ function newAppLoader() {
                 'AppSchema.js',
                 'MQService',
 
-                'ChartsSpace/EdgeEditor.js',
-                'ChartsSpace/ChartUtilities.js',
-                'ChartsSpace/PlottersManager.js',
-                'ChartsSpace/TimelineChart.js',
-                'ChartsSpace/TimeMachine.js',
-                'ChartsSpace/CoordinateSystem.js',
+                'ChartingSpace/EdgeEditor.js',
+                'ChartingSpace/ChartUtilities.js',
+                'ChartingSpace/PlottersManager.js',
+                'ChartingSpace/TimelineChart.js',
+                'ChartingSpace/TimeMachine.js',
+                'ChartingSpace/CoordinateSystem.js',
 
-                'DesignerSpace/Workspace/Workspace.js',
-                'DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js',
-                'DesignerSpace/Workspace/FunctionLibraries/ChainAttachDetach.js',
-                'DesignerSpace/Workspace/FunctionLibraries/ReferenceAttachDetach.js',
-                'DesignerSpace/Workspace/FunctionLibraries/NodeDeleter.js',
-                'DesignerSpace/Workspace/FunctionLibraries/ProtocolNode.js',
-                'DesignerSpace/Workspace/FunctionLibraries/NodeCloning.js',
-                'DesignerSpace/Workspace/FunctionLibraries/NodeChildren.js', 
-                'DesignerSpace/Workspace/FunctionLibraries/TaskFunctions.js',
-                'DesignerSpace/Workspace/FunctionLibraries/SessionFunctions.js',
-                'DesignerSpace/Workspace/FunctionLibraries/ShortcutKeys.js',
-                'DesignerSpace/Workspace/FunctionLibraries/OnFocus.js',
+                'DesignSpace/Workspace/Workspace.js',
+                'DesignSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js',
+                'DesignSpace/Workspace/FunctionLibraries/ChainAttachDetach.js',
+                'DesignSpace/Workspace/FunctionLibraries/ReferenceAttachDetach.js',
+                'DesignSpace/Workspace/FunctionLibraries/NodeDeleter.js',
+                'DesignSpace/Workspace/FunctionLibraries/ProtocolNode.js',
+                'DesignSpace/Workspace/FunctionLibraries/NodeCloning.js',
+                'DesignSpace/Workspace/FunctionLibraries/NodeChildren.js', 
+                'DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js',
+                'DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js',
+                'DesignSpace/Workspace/FunctionLibraries/ShortcutKeys.js',
+                'DesignSpace/Workspace/FunctionLibraries/OnFocus.js',
                 
                 'Utilities/RoundedCornersBackground.js',
 
@@ -68,9 +68,9 @@ function newAppLoader() {
                 'Spaces/CockpitSpace.js',
                 'Spaces/TopSpace.js',
                 'Spaces/PanelsSpace.js',
-                'Spaces/ChartSpace.js',
+                'Spaces/ChartingSpace.js',
                 'Spaces/FloatingSpace.js',
-                'Spaces/DesignerSpace.js',
+                'Spaces/DesignSpace.js',
 
                 'Files/SingleFile.js',
                 'Files/FileCloud.js',
@@ -122,7 +122,7 @@ function newAppLoader() {
                 'Container.js',
 
                 'Utilities.js',
-                'Dashboard.js'
+                'PostLoader.js'
             ])
 
             modulesArray = modulesArray.concat(plotters)
diff --git a/server.js b/server.js
index 47840ab3c..ec81065fb 100644
--- a/server.js
+++ b/server.js
@@ -237,31 +237,31 @@ function onBrowserRequest (request, response) {
       }
       break
 
-    case 'DesignerSpace': // This means the DesignerSpace folder.
+    case 'DesignSpace': // This means the DesignSpace folder.
 
       {
         if (requestParameters[3] === undefined) {
-          respondWithFile(process.env.PATH_TO_CANVAS_APP + '/DesignerSpace/' + requestParameters[2], response)
+          respondWithFile(process.env.PATH_TO_CANVAS_APP + '/DesignSpace/' + requestParameters[2], response)
           return
         }
         if (requestParameters[4] === undefined) {
-          respondWithFile(process.env.PATH_TO_CANVAS_APP + '/DesignerSpace/' + requestParameters[2] + '/' + requestParameters[3], response)
+          respondWithFile(process.env.PATH_TO_CANVAS_APP + '/DesignSpace/' + requestParameters[2] + '/' + requestParameters[3], response)
           return
         }
         if (requestParameters[5] === undefined) {
-          respondWithFile(process.env.PATH_TO_CANVAS_APP + '/DesignerSpace/' + requestParameters[2] + '/' + requestParameters[3] + '/' + requestParameters[4], response)
+          respondWithFile(process.env.PATH_TO_CANVAS_APP + '/DesignSpace/' + requestParameters[2] + '/' + requestParameters[3] + '/' + requestParameters[4], response)
           return
         }
       }
       break
 
-    case 'ControlsToolBox': // This means the DesignerSpace folder.
+    case 'ControlsToolBox': // This means the DesignSpace folder.
       {
         respondWithFile(process.env.PATH_TO_CANVAS_APP + '/ControlsToolBox/' + requestParameters[2], response)
       }
       break
 
-    case 'Utilities': // This means the DesignerSpace folder.
+    case 'Utilities': // This means the DesignSpace folder.
       {
         respondWithFile(process.env.PATH_TO_CANVAS_APP + '/Utilities/' + requestParameters[2], response)
       }
@@ -334,7 +334,7 @@ function onBrowserRequest (request, response) {
       }
       break
 
-    case 'ChartsSpace':
+    case 'ChartingSpace':
       {
         respondWithFile(process.env.PATH_TO_CANVAS_APP + '/' + requestParameters[1] + '/' + requestParameters[2], response)
       }