diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config
index 4918147107..9c2ac0498e 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.config
@@ -10,6 +10,16 @@
       </control>
     </tab>
   </section>
+  <section alias="StartupFormsDashboardSection">
+    <areas>
+      <area>forms</area>
+    </areas>
+    <tab caption="Install Umbraco Forms">
+      <control showOnce="true" addPanel="true" panelCaption="">
+        views/dashboard/forms/formsdashboardintro.html
+      </control>
+    </tab>
+  </section>
   <section alias="StartupDeveloperDashboardSection">
     <areas>
       <area>developer</area>
@@ -35,6 +45,16 @@
       </control>
     </tab>
   </section>
+  <section alias="StartupFormsDashboardSection">
+    <areas>
+      <area>forms</area>
+    </areas>
+    <tab caption="Install Umbraco Forms">
+      <control showOnce="true" addPanel="true" panelCaption="">
+        views/dashboard/forms/formsdashboardintro.html
+      </control>
+    </tab>
+  </section>
   <section alias="StartupDashboardSection">
     <access>
       <deny>translator</deny>
@@ -109,14 +129,4 @@
       </control>
     </tab>
   </section>
-  <section alias="StartupFormsDashboardSection">
-    <areas>
-      <area>forms</area>
-    </areas>
-    <tab caption="Dashboard">
-      <control>/app_plugins/umbracoforms/backoffice/dashboards/licensing.html</control>
-      <control>/app_plugins/umbracoforms/backoffice/dashboards/yourforms.html</control>
-      <control>/app_plugins/umbracoforms/backoffice/dashboards/activity.html</control>
-    </tab>
-  </section>
-</dashBoard>
\ No newline at end of file
+</dashBoard>
diff --git a/src/Umbraco.Web.UI/config/FileSystemProviders.config b/src/Umbraco.Web.UI/config/FileSystemProviders.config
index bf9e14c8c0..ae2addc39a 100644
--- a/src/Umbraco.Web.UI/config/FileSystemProviders.config
+++ b/src/Umbraco.Web.UI/config/FileSystemProviders.config
@@ -8,11 +8,4 @@
     </Parameters>
   </Provider>
    
-   <!--
-<Provider alias="forms" type="Umbraco.Core.IO.PhysicalFileSystem, Umbraco.Core">
-    <Parameters>
-        <add key="virtualRoot" value="~/App_Data/ZbForms" />
-    </Parameters>
-</Provider>
--->
 </FileSystemProviders>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 892dbf4842..c3aac3a243 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <language alias="en" intName="English (UK)" localName="English (UK)" lcid="" culture="en-GB">
   <creator>
     <name>The Umbraco community</name>
@@ -40,7 +40,7 @@
     <key alias="translate">Translate</key>
     <key alias="update">Update</key>
     <key alias="defaultValue">Default value</key>
-  <key alias="exportContourForm">Export form</key><key alias="importContourForm">Import form</key><key alias="archiveContourForm">Archive form</key><key alias="unarchiveContourForm">Unarchive form</key><key alias="defaultValue">Default value</key><key alias="exportContourForm">Export form</key><key alias="importContourForm">Import form</key><key alias="archiveContourForm">Archive form</key><key alias="unarchiveContourForm">Unarchive form</key><key alias="defaultValue">Default value</key></area>
+  </area>
   <area alias="assignDomain">
     <key alias="permissionDenied">Permission denied.</key>
     <key alias="addNew">Add new Domain</key>
@@ -934,7 +934,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="help" version="7.0">Help</key>
     <key alias="forms">Forms</key>
     <key alias="analytics">Analytics</key>
-  <key alias="forms">Forms</key><key alias="forms">Forms</key></area>
+  </area>
   <area alias="help">
     <key alias="goTo">go to</key>
     <key alias="helpTopicsFor">Help topics for</key>
@@ -1117,7 +1117,7 @@ To manage your website, simply open the Umbraco back office and start adding con
 
     <key alias="iWant">I want</key>   
     <key alias="allContent">all content</key>
-    <key alias="contentOfType">content of type "%0%"</key>
+    <key alias="contentOfType">content of type &quot;%0%&quot;</key>
     <key alias="from">from</key>
     <key alias="websiteRoot">my website</key>
     <key alias="where">where</key>