diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
index c3c2a7f4ab..ce694ff5ea 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.html
@@ -2,61 +2,60 @@
 
     <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
-    <form novalidate name="contentTypeForm"
-          ng-submit="vm.save()"
-          val-form-manager>
+    <form novalidate name="contentTypeForm" val-form-manager>
 
         <umb-editor-view ng-if="!vm.page.loading">
 
             <umb-editor-header
-                    name="vm.contentType.name"
-                    alias="vm.contentType.alias"
-                    description="vm.contentType.description"
-                    navigation="vm.page.navigation"
-                    icon="vm.contentType.icon">
+                name="vm.contentType.name"
+                alias="vm.contentType.alias"
+                description="vm.contentType.description"
+                navigation="vm.page.navigation"
+                icon="vm.contentType.icon">
             </umb-editor-header>
 
             <umb-editor-container>
 
-               <umb-editor-sub-views ng-if="!vm.page.loading" sub-views="vm.page.navigation" model="vm.contentType"></umb-editor-sub-views>
+                <umb-editor-sub-views
+                    ng-if="!vm.page.loading"
+                    sub-views="vm.page.navigation"
+                    model="vm.contentType">
+                </umb-editor-sub-views>
 
             </umb-editor-container>
 
             <umb-editor-footer>
 
-               <umb-editor-footer-content-left>
+                <umb-editor-footer-content-left>
 
-                  <umb-keyboard-shortcuts-overview
-                    model="vm.page.keyboardShortcutsOverview">
-                  </umb-keyboard-shortcuts-overview>
+                    <umb-keyboard-shortcuts-overview
+                        model="vm.page.keyboardShortcutsOverview">
+                    </umb-keyboard-shortcuts-overview>
 
-               </umb-editor-footer-content-left>
+                </umb-editor-footer-content-left>
 
-               <umb-editor-footer-content-right>
+                <umb-editor-footer-content-right>
 
-                <umb-button 
-                            ng-if="!vm.page.modelsBuilder"
-                            type="submit"
-                            state="vm.page.saveButtonState"
-                            button-style="success"
-                            shortcut="ctrl+s"
-                            label="Save"
-                            label-key="buttons_save">
-                </umb-button>
-                       
+                    <umb-button
+                        ng-if="!vm.page.modelsBuilder"
+                        type="button" action="vm.save()"
+                        state="vm.page.saveButtonState"
+                        button-style="success"
+                        shortcut="ctrl+s"
+                        label="Save"
+                        label-key="buttons_save">
+                    </umb-button>
 
-                <umb-button-group
-                      ng-if="vm.page.modelsBuilder"              
-                      default-button="vm.page.defaultButton"
-                      sub-buttons="vm.page.subButtons"
-                      state="vm.page.saveButtonState"
-                      direction="up"
-                      float="right">
-                </umb-button-group>
-
-
-               </umb-editor-footer-content-right>
+                    <umb-button-group
+                        ng-if="vm.page.modelsBuilder"
+                        default-button="vm.page.defaultButton"
+                        sub-buttons="vm.page.subButtons"
+                        state="vm.page.saveButtonState"
+                        direction="up"
+                        float="right">
+                    </umb-button-group>
 
+                </umb-editor-footer-content-right>
 
             </umb-editor-footer>
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
index b6c507ec0c..c1a3f69241 100644
--- a/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.html
@@ -1,70 +1,71 @@
 <div ng-controller="Umbraco.Editors.MediaTypes.EditController as vm">
 
-   <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
+    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
 
-    <form novalidate name="contentTypeForm"
-          ng-submit="vm.save()"
-          val-form-manager>
+    <form novalidate name="contentTypeForm" val-form-manager>
 
         <umb-editor-view ng-if="!vm.page.loading">
 
             <umb-editor-header
-                    name="vm.contentType.name"
-                    alias="vm.contentType.alias"
-                    description="vm.contentType.description"
-                    navigation="vm.page.navigation"
-                    icon="vm.contentType.icon">
+                name="vm.contentType.name"
+                alias="vm.contentType.alias"
+                description="vm.contentType.description"
+                navigation="vm.page.navigation"
+                icon="vm.contentType.icon">
             </umb-editor-header>
 
             <umb-editor-container class="editors-document-type-container">
 
                 <div class="editors-document-type-canvas">
 
-                    <umb-editor-sub-views ng-if="!vm.page.loading" sub-views="vm.page.navigation" model="vm.contentType"></umb-editor-sub-views>
+                    <umb-editor-sub-views
+                        ng-if="!vm.page.loading"
+                        sub-views="vm.page.navigation"
+                        model="vm.contentType">
+                    </umb-editor-sub-views>
 
                 </div>
 
             </umb-editor-container>
 
-
             <umb-editor-footer>
 
-               <umb-editor-footer-content-left>
+                <umb-editor-footer-content-left>
 
-                  <umb-keyboard-shortcuts-overview
-                    model="vm.page.keyboardShortcutsOverview">
-                  </umb-keyboard-shortcuts-overview>
+                    <umb-keyboard-shortcuts-overview
+                        model="vm.page.keyboardShortcutsOverview">
+                    </umb-keyboard-shortcuts-overview>
 
-               </umb-editor-footer-content-left>
+                </umb-editor-footer-content-left>
 
-               <umb-editor-footer-content-right>
+                <umb-editor-footer-content-right>
 
-                   <umb-button ng-if="!vm.page.modelsBuilder"
-                               type="submit"
-                               state="vm.page.saveButtonState"
-                               button-style="success"
-                               shortcut="ctrl+s"
-                               label="Save"
-                               label-key="buttons_save">
-                   </umb-button>
+                    <umb-button
+                        ng-if="!vm.page.modelsBuilder"
+                        type="button"
+                        action="vm.save()"
+                        state="vm.page.saveButtonState"
+                        button-style="success"
+                        shortcut="ctrl+s"
+                        label="Save"
+                        label-key="buttons_save">
+                    </umb-button>
 
+                    <umb-button-group
+                        ng-if="vm.page.modelsBuilder"
+                        default-button="vm.page.defaultButton"
+                        sub-buttons="vm.page.subButtons"
+                        state="vm.page.saveButtonState"
+                        direction="up"
+                        float="right">
+                    </umb-button-group>
 
-                   <umb-button-group ng-if="vm.page.modelsBuilder"
-                                     default-button="vm.page.defaultButton"
-                                     sub-buttons="vm.page.subButtons"
-                                     state="vm.page.saveButtonState"
-                                     direction="up"
-                                     float="right">
-                   </umb-button-group>
-
-               </umb-editor-footer-content-right>
-
+                </umb-editor-footer-content-right>
 
             </umb-editor-footer>
 
         </umb-editor-view>
 
-
     </form>
 
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
index 64ffe504b1..eb34aae6cc 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/edit.html
@@ -1,67 +1,69 @@
 <div ng-controller="Umbraco.Editors.MemberTypes.EditController as vm">
 
-   <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
+    <umb-load-indicator ng-if="vm.page.loading"></umb-load-indicator>
+
+    <form novalidate name="contentTypeForm" val-form-manager>
 
-    <form novalidate name="contentTypeForm"
-          ng-submit="vm.save()"
-          val-form-manager>
-          
         <umb-editor-view ng-if="!vm.page.loading">
 
             <umb-editor-header
-                    name="vm.contentType.name"
-                    alias="vm.contentType.alias"
-                    description="vm.contentType.description"
-                    navigation="vm.page.navigation"
-                    icon="vm.contentType.icon">
+                name="vm.contentType.name"
+                alias="vm.contentType.alias"
+                description="vm.contentType.description"
+                navigation="vm.page.navigation"
+                icon="vm.contentType.icon">
             </umb-editor-header>
 
             <umb-editor-container class="editors-document-type-container">
 
                 <div class="editors-document-type-canvas">
-                    <umb-editor-sub-views ng-if="!vm.page.loading" sub-views="vm.page.navigation" model="vm.contentType"></umb-editor-sub-views>
+                    <umb-editor-sub-views
+                        ng-if="!vm.page.loading"
+                        sub-views="vm.page.navigation"
+                        model="vm.contentType">
+                    </umb-editor-sub-views>
                 </div>
 
             </umb-editor-container>
 
-
             <umb-editor-footer>
 
-               <umb-editor-footer-content-left>
+                <umb-editor-footer-content-left>
 
-                  <umb-keyboard-shortcuts-overview
-                    model="vm.page.keyboardShortcutsOverview">
-                  </umb-keyboard-shortcuts-overview>
+                    <umb-keyboard-shortcuts-overview
+                        model="vm.page.keyboardShortcutsOverview">
+                    </umb-keyboard-shortcuts-overview>
 
-               </umb-editor-footer-content-left>
+                </umb-editor-footer-content-left>
 
-               <umb-editor-footer-content-right>
+                <umb-editor-footer-content-right>
 
-                   <umb-button ng-if="!vm.page.modelsBuilder"
-                               type="submit"
-                               state="vm.page.saveButtonState"
-                               button-style="success"
-                               shortcut="ctrl+s"
-                               label="Save"
-                               label-key="buttons_save">
-                   </umb-button>
+                    <umb-button
+                        ng-if="!vm.page.modelsBuilder"
+                        type="button"
+                        action="vm.save()"
+                        state="vm.page.saveButtonState"
+                        button-style="success"
+                        shortcut="ctrl+s"
+                        label="Save"
+                        label-key="buttons_save">
+                    </umb-button>
 
+                    <umb-button-group
+                        ng-if="vm.page.modelsBuilder"
+                        default-button="vm.page.defaultButton"
+                        sub-buttons="vm.page.subButtons"
+                        state="vm.page.saveButtonState"
+                        direction="up"
+                        float="right">
+                    </umb-button-group>
 
-                   <umb-button-group ng-if="vm.page.modelsBuilder"
-                                     default-button="vm.page.defaultButton"
-                                     sub-buttons="vm.page.subButtons"
-                                     state="vm.page.saveButtonState"
-                                     direction="up"
-                                     float="right">
-                   </umb-button-group>
-
-               </umb-editor-footer-content-right>
+                </umb-editor-footer-content-right>
 
             </umb-editor-footer>
 
         </umb-editor-view>
 
-
     </form>
 
 </div>