diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
index 37eef7ddde..54e7a782fd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypepicker/datatypepicker.html
@@ -1,5 +1,5 @@
 <div ng-controller="Umbraco.Editors.DataTypePickerController as vm">
-    <umb-editor-view>
+    <umb-editor-view data-element="editor-data-type-picker">
 
         <form novalidate name="DataTypePickerForm" val-form-manager>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
index edba569dd2..b4ff894c4d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/datatypesettings/datatypesettings.html
@@ -1,5 +1,5 @@
 <div ng-controller="Umbraco.Editors.DataTypeSettingsController as vm">
-<umb-editor-view>
+<umb-editor-view data-element="editor-data-type-settings">
 
     <form novalidate name="dataTypeSettingsForm" val-form-manager>
 
@@ -55,6 +55,7 @@
                     action="vm.close()">
                 </umb-button>
                 <umb-button
+                    alias="submit"
                     type="button"
                     button-style="success"
                     label-key="general_submit"
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
index 2930f33a82..610af28cb8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
@@ -2,7 +2,7 @@
 
 <form name="propertySettingsForm" novalidate val-form-manager>
 
-    <umb-editor-view>
+    <umb-editor-view data-element="editor-property-settings">
 
         <umb-editor-header
             name="model.title"
@@ -159,6 +159,7 @@
                 </umb-button>
 
                 <umb-button
+                    alias="submit"
                     type="button"
                     button-style="success"
                     label-key="general_submit"
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
index b7a44734eb..2ecd1c518c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
@@ -10,12 +10,12 @@
                     <small><localize key="contentTypeEditor_allowAsRootDescription" /></small>
                 </div>
                 <div class="sub-view-column-right">
-            <umb-toggle
-                checked="model.allowAsRoot"
-                on-click="vm.toggle()"
-                hotkey="alt+shift+r"
-                >
-            </umb-toggle>
+                    <umb-toggle
+                        data-element="permissions-allow-as-root"
+                        checked="model.allowAsRoot"
+                        on-click="vm.toggle()"
+                        hotkey="alt+shift+r">
+                    </umb-toggle>
                 </div>
 
             </div>
diff --git a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
index 4d369d079a..4bf119d966 100644
--- a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
+++ b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
@@ -190,23 +190,35 @@
                 "event": "click"
             },
             {
-                "element": "[data-element~='overlay-editor-settings']",
+                "element": "[data-element~='editor-data-type-settings']",
                 "elementPreventClick": true,
                 "title": "Editor settings",
                 "content": "Each property editor can have individual settings. For the textarea editor you can set a character limit but in this case it is not needed."
             },
             {
-                "element": "[data-element~='overlay-editor-settings'] [data-element='button-overlaySubmit']",
+                "element": "[data-element~='editor-data-type-settings'] [data-element='button-submit']",
                 "title": "Save editor",
                 "content": "Click <b>Submit</b> to save the changes.",
                 "event": "click"
             },
             {
-                "element": "[data-element~='overlay-property-settings'] [data-element='button-overlaySubmit']",
+                "element": "[data-element~='editor-property-settings'] [data-element='button-submit']",
                 "title": "Add property to document type",
                 "content": "Click <b>Submit</b> to add the property to the document type.",
                 "event": "click"
             },
+            {
+                "element": "[data-element~='sub-view-permissions']",
+                "title": "Check the document type permissions",
+                "content": "Click <b>Permissions</b> to view the permissions page.",
+                "event": "click"
+            },
+            {
+                "element": "[data-element~='permissions-allow-as-root']",
+                "title": "Allow this document type to work at the root of your site",
+                "content": "Toggle the switch <b>Allow as root</b> to allow new content pages based on this document type to be created at the root of your site",
+                "event": "click"
+            },
             {
                 "element": "[data-element='button-save']",
                 "title": "Save the document type",
@@ -364,9 +376,9 @@
                 "eventElement": "#tree [data-element='tree-item-Home'] a.umb-tree-item__label"
             },
             {
-                "element": "[data-element='editor-content'] [data-element='tab-_umb_infoTab']",
+                "element": "[data-element='editor-content'] [data-element='sub-view-info']",
                 "title": "Info",
-                "content": "<p>Under the info tab you will find the default information about a content item.</p>",
+                "content": "<p>Under the Info-app you will find the default information about a content item.</p>",
                 "event": "click"
             },
             {