diff --git a/src/Umbraco.Web.UI/config/Dashboard.Release.config b/src/Umbraco.Web.UI/config/Dashboard.Release.config
index 0e929e12bc..fec6ab34ae 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.Release.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.Release.config
@@ -1,115 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dashBoard>
 
-  <section alias="StartupSettingsDashboardSection">
-    <areas>
-      <area>settings</area>
-    </areas>
-    <tab caption="Welcome">
-      <control panelCaption="">
-        views/dashboard/settings/settingsdashboardintro.html
-      </control>
-    </tab>
-      <tab caption="Examine Management">
-          <control>
+    <section alias="StartupSettingsDashboardSection">
+        <areas>
+            <area>settings</area>
+        </areas>
+        <tab caption="Welcome">
+            <control panelCaption="">
+                views/dashboard/settings/settingsdashboardintro.html
+            </control>
+        </tab>
+        <tab caption="Examine Management">
+            <control>
               views/dashboard/settings/examinemanagement.html
           </control>
-      </tab>
-      <tab caption="Published Status">
-          <control>
+        </tab>
+        <tab caption="Published Status">
+            <control>
               views/dashboard/settings/publishedstatus.html
           </control>
-      </tab>
-  </section>
+        </tab>
+    </section>
 
-  <section alias="StartupFormsDashboardSection">
-    <areas>
-      <area>forms</area>
-    </areas>
-    <tab caption="Install Umbraco Forms">
-      <control panelCaption="">
-        views/dashboard/forms/formsdashboardintro.html
-      </control>
-    </tab>
-  </section>
+    <section alias="StartupFormsDashboardSection">
+        <areas>
+            <area>forms</area>
+        </areas>
+        <tab caption="Install Umbraco Forms">
+            <control panelCaption="">
+                views/dashboard/forms/formsdashboardintro.html
+            </control>
+        </tab>
+    </section>
 
-  <section alias="StartupDeveloperDashboardSection">
-    <areas>
-      <area>developer</area>
-    </areas>
-  </section>
+    <section alias="StartupMediaDashboardSection">
+        <areas>
+            <area>media</area>
+        </areas>
+        <tab caption="Content">
+            <control panelCaption="">
+                views/dashboard/media/mediafolderbrowser.html
+            </control>
+        </tab>
+    </section>
 
-  <section alias="StartupMediaDashboardSection">
-    <areas>
-      <area>media</area>
-    </areas>
-    <tab caption="Content">
-      <control panelCaption="">
-        views/dashboard/media/mediafolderbrowser.html
-      </control>
-    </tab>
+    <section alias="StartupDashboardSection">
+        <access>
+            <deny>translator</deny>
+        </access>
+        <areas>
+            <area>content</area>
+        </areas>
+        <tab caption="Get Started">
+            <access>
+                <grant>admin</grant>
+            </access>
 
-  </section>
+            <control panelCaption="">
+                views/dashboard/default/startupdashboardintro.html
+            </control>
+        </tab>
+    </section>
 
-  <section alias="StartupDashboardSection">
-    <access>
-      <deny>translator</deny>
-    </access>
-    <areas>
-      <area>content</area>
-    </areas>
-    <tab caption="Get Started">
-      <access>
-        <grant>admin</grant>
-      </access>
+    <section alias="StartupMemberDashboardSection">
+        <areas>
+            <area>member</area>
+        </areas>
+        <tab caption="Get Started">
+            <control panelCaption="">
+                views/dashboard/members/membersdashboardvideos.html
+            </control>
+        </tab>
+    </section>
 
-      <control panelCaption="">
-        views/dashboard/default/startupdashboardintro.html
-      </control>
+    <section alias="UmbracoModelsBuilder">
+        <areas>
+            <area>settings</area>
+        </areas>
+        <tab caption="Models Builder">
+            <control>
+                /App_Plugins/ModelsBuilder/modelsbuilder.htm
+            </control>
+        </tab>
+    </section>
 
-    </tab>
-  </section>
-
-  <section alias="StartupMemberDashboardSection">
-    <areas>
-      <area>member</area>
-    </areas>
-    <tab caption="Get Started">
-      <control panelCaption="">
-        views/dashboard/members/membersdashboardvideos.html
-      </control>
-    </tab>
-  </section>
-
-  <section alias="UmbracoModelsBuilder">
-    <areas>
-      <area>developer</area>
-    </areas>
-    <tab caption="Models Builder">
-      <control>
-        /App_Plugins/ModelsBuilder/modelsbuilder.htm
-      </control>
-    </tab>
-  </section>
-
-  <section alias="UmbracoHealthCheck">
-    <areas>
-      <area>settings</area>
-    </areas>
-    <tab caption="Health Check">
-      <control>
-        views/dashboard/settings/healthcheck.html
-      </control>
-    </tab>
-  </section>
-  <section alias="RedirectUrlManagement">
-    <areas>
-      <area>content</area>
-    </areas>
-    <tab caption="Redirect URL Management">
-      <control>
-        views/dashboard/content/redirecturls.html
-      </control>
-    </tab>
-  </section>
+    <section alias="UmbracoHealthCheck">
+        <areas>
+            <area>settings</area>
+        </areas>
+        <tab caption="Health Check">
+            <control>
+                views/dashboard/settings/healthcheck.html
+            </control>
+        </tab>
+    </section>
+    <section alias="RedirectUrlManagement">
+        <areas>
+            <area>content</area>
+        </areas>
+        <tab caption="Redirect URL Management">
+            <control>
+                views/dashboard/content/redirecturls.html
+            </control>
+        </tab>
+    </section>
 </dashBoard>
diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config
index 460a81e10b..fec6ab34ae 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dashBoard>
+
     <section alias="StartupSettingsDashboardSection">
         <areas>
             <area>settings</area>
@@ -11,15 +12,16 @@
         </tab>
         <tab caption="Examine Management">
             <control>
-                views/dashboard/settings/examinemanagement.html
-            </control>
+              views/dashboard/settings/examinemanagement.html
+          </control>
         </tab>
         <tab caption="Published Status">
             <control>
-                views/dashboard/settings/publishedstatus.html
-            </control>
+              views/dashboard/settings/publishedstatus.html
+          </control>
         </tab>
     </section>
+
     <section alias="StartupFormsDashboardSection">
         <areas>
             <area>forms</area>
@@ -29,7 +31,8 @@
                 views/dashboard/forms/formsdashboardintro.html
             </control>
         </tab>
-    </section>    
+    </section>
+
     <section alias="StartupMediaDashboardSection">
         <areas>
             <area>media</area>
@@ -40,16 +43,7 @@
             </control>
         </tab>
     </section>
-    <section alias="StartupFormsDashboardSection">
-        <areas>
-            <area>forms</area>
-        </areas>
-        <tab caption="Install Umbraco Forms">
-            <control panelCaption="">
-                views/dashboard/forms/formsdashboardintro.html
-            </control>
-        </tab>
-    </section>
+
     <section alias="StartupDashboardSection">
         <access>
             <deny>translator</deny>
@@ -61,11 +55,13 @@
             <access>
                 <grant>admin</grant>
             </access>
+
             <control panelCaption="">
                 views/dashboard/default/startupdashboardintro.html
             </control>
         </tab>
     </section>
+
     <section alias="StartupMemberDashboardSection">
         <areas>
             <area>member</area>
@@ -76,14 +72,18 @@
             </control>
         </tab>
     </section>
-    <section alias="contour">
+
+    <section alias="UmbracoModelsBuilder">
         <areas>
-            <area>contour</area>
+            <area>settings</area>
         </areas>
-        <tab caption="Dashboard">
-            <control>plugins/umbracocontour/formsdashboard.ascx</control>
+        <tab caption="Models Builder">
+            <control>
+                /App_Plugins/ModelsBuilder/modelsbuilder.htm
+            </control>
         </tab>
     </section>
+
     <section alias="UmbracoHealthCheck">
         <areas>
             <area>settings</area>
@@ -104,14 +104,4 @@
             </control>
         </tab>
     </section>
-    <section alias="UmbracoModelsBuilder">
-        <areas>
-            <area>settings</area>
-        </areas>
-        <tab caption="Models Builder">
-            <control>
-                /App_Plugins/ModelsBuilder/modelsbuilder.htm
-            </control>
-        </tab>
-    </section>
 </dashBoard>
diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs
index bc7a45d93b..186e0e0a13 100644
--- a/src/Umbraco.Web/Editors/DashboardController.cs
+++ b/src/Umbraco.Web/Editors/DashboardController.cs
@@ -38,10 +38,6 @@ namespace Umbraco.Web.Editors
         [ValidateAngularAntiForgeryToken]
         public async Task<JObject> GetRemoteDashboardContent(string section, string baseUrl = "https://dashboard.umbraco.org/")
         {
-            var context = UmbracoContext.Current;
-            if (context == null)
-                throw new HttpResponseException(HttpStatusCode.InternalServerError);
-
             var user = Security.CurrentUser;
             var allowedSections = string.Join(",", user.AllowedSections);
             var language = user.Language;