diff --git a/src/views/app.html b/src/views/app.html
index 7224cf289..98ade1e4d 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -340,8 +340,8 @@
       </div>
       <div class="modal-body" style="padding: 0 15px">
         <p>Using backup from <b>{{ clone.backup.creationTime | prettyDate }}</b> and version <b>v{{ clone.backup.version }}</b></p>
-        <fieldset>
-          <form role="form" ng-submit="clone.submit()" autocomplete="off">
+        <form role="form" ng-submit="clone.submit()" autocomplete="off">
+          <fieldset>
             <div class="form-group" ng-class="{ 'has-error': clone.error.location }">
               <label class="control-label" for="cloneLocationInput">Location</label>
               <div ng-show="clone.error.location"><small>{{ clone.error.location }}</small></div>
@@ -386,8 +386,8 @@
                 </div>
               </ng-form>
             </div>
-          </form>
-        </fieldset>
+          </fieldset>
+        </form>
       </div>
 
       <div class="modal-footer">
@@ -461,8 +461,8 @@
       <div class="card" ng-show="view === 'display'">
         <div class="row">
           <div class="col-md-12">
-            <fieldset>
-              <form role="form" name="displayForm" ng-submit="display.submit()" autocomplete="off">
+            <form role="form" name="displayForm" ng-submit="display.submit()" autocomplete="off">
+              <fieldset>
                 <div class="form-group" ng-class="{ 'has-error': !displayForm.label.$dirty && display.error.label }">
                   <label class="control-label">Label</label>
                   <div class="control-label" ng-show="display.error.label">{{display.error.label}}</div>
@@ -485,8 +485,8 @@
                 </div>
 
                 <input class="ng-hide" type="submit" ng-disabled="(!display.icon.data && !displayForm.$dirty) || displayForm.$invalid || display.busy"/>
-              </form>
-            </fieldset>
+              </fieldset>
+            </form>
           </div>
         </div>
         <div class="row">
@@ -499,8 +499,8 @@
       <div class="card" ng-show="view === 'location'">
         <div class="row">
           <div class="col-md-12">
-            <fieldset>
-              <form role="form" name="locationForm" ng-submit="location.submit()" autocomplete="off">
+            <form role="form" name="locationForm" ng-submit="location.submit()" autocomplete="off">
+              <fieldset>
                 <div class="form-group" ng-class="{ 'has-error': (locationForm.location.$dirty && locationForm.location.$invalid) || (!locationForm.location.$dirty && location.error.location)  }">
                   <label class="control-label">Location</label>
                   <div class="has-error" ng-show="location.error.location">{{ location.error.location }}</div>
@@ -584,8 +584,8 @@
                     <a href="" ng-click="location.addAlternateDomain($event)">Add another domain</a>
                   </div>
                 </div>
-              </form>
-            </fieldset>
+              </fieldset>
+            </form>
           </div>
         </div>
         <div class="row">
@@ -600,8 +600,8 @@
       <div class="card" ng-show="view === 'access'">
         <div class="row">
           <div class="col-md-12">
-            <fieldset>
-              <form role="form" name="accessForm" ng-submit="access.submit()" autocomplete="off">
+            <form role="form" name="accessForm" ng-submit="access.submit()" autocomplete="off">
+              <fieldset>
                 <div class="form-group">
                   <div ng-show="access.ssoAuth">
                     <label class="control-label">User management</label>
@@ -649,8 +649,8 @@
 
                   <input class="ng-hide" type="submit" ng-disabled="(access.accessRestrictionOption === 'groups' && !access.isAccessRestrictionValid()) || accessForm.$invalid || access.busy"/>
                 </div>
-              </form>
-            </fieldset>
+              </fieldset>
+            </form>
           </div>
         </div>
         <div class="row">
@@ -672,8 +672,8 @@
       <div class="card" ng-show="view === 'resources'">
         <div class="row">
           <div class="col-md-12">
-            <fieldset>
-              <form role="form" name="resourcesForm" ng-submit="resources.submitMemoryLimit()" autocomplete="off">
+            <form role="form" name="resourcesForm" ng-submit="resources.submitMemoryLimit()" autocomplete="off">
+              <fieldset>
                 <div class="form-group">
                   <label class="control-label" for="memoryLimit">Memory Limit <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#memory-limit" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> : <b>{{ resources.memoryLimit ? resources.memoryLimit / 1024 / 1024 + 'MB' : 'Default (256 MB)' }}</b></label>
                   <p>Cloudron allocates 50% of this value as RAM and 50% as swap.</p>
@@ -683,8 +683,8 @@
                 </div>
 
                 <input class="ng-hide" type="submit" ng-disabled="resources.memoryLimit === resources.currentMemoryLimit || resourcesForm.$invalid || resources.busy"/>
-              </form>
-            </fieldset>
+              </fieldset>
+            </form>
           </div>
         </div>
         <div class="row">
@@ -697,8 +697,8 @@
         <hr/>
         <div class="row">
           <div class="col-md-12">
-            <fieldset>
-              <form role="form" name="resourcesForm" ng-submit="resources.submitCpuShares()" autocomplete="off">
+            <form role="form" name="resourcesForm" ng-submit="resources.submitCpuShares()" autocomplete="off">
+              <fieldset>
                 <div class="form-group">
                   <label class="control-label" for="cpuShares">CPU Shares <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#cpu-shares" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> : <b>{{ (resources.cpuShares * 100 / 1024 | number:0) + ' %' }}</b></label>
                   <p>Percent of CPU time when system is under heavy load.</p>
@@ -708,8 +708,8 @@
                 </div>
 
                 <input class="ng-hide" type="submit" ng-disabled="resources.cpuShares === resources.currentCpuShares || resourcesForm.$invalid || resources.busyCpuShares"/>
-              </form>
-            </fieldset>
+              </fieldset>
+            </form>
           </div>
         </div>
         <div class="row">
@@ -727,16 +727,16 @@
               By default, this app's data is located at <code>/home/yellowtent/appsdata/{{ app.id }}</code>. If the server is running out of disk space,
               you can mount an external disk and move this app's data there.
             </p>
-            <fieldset>
-              <form role="form" name="resourcesDataDirForm" ng-submit="resources.submitDataDir()" autocomplete="off">
+            <form role="form" name="resourcesDataDirForm" ng-submit="resources.submitDataDir()" autocomplete="off">
+              <fieldset>
                 <div class="form-group" ng-class="{ 'has-error': resourcesDataDirForm.$dirty && resources.error.dataDir }">
                   <div ng-show="resources.error.dataDir">{{ resources.error.dataDir }}</div>
                   <input type="text" class="form-control" name="dataDir" placeholder="Leave empty to use platform default" ng-model="resources.dataDir">
                 </div>
 
                 <input class="ng-hide" type="submit" ng-disabled="!resourcesDataDirForm.$dirty || resourcesDataDirForm.$invalid || resources.busyDataDir"/>
-              </form>
-            </fieldset>
+              </fieldset>
+            </form>
           </div>
         </div>
         <div class="row">
@@ -754,8 +754,8 @@
             <label class="control-label" for="emailMailboxNameEnabled">Mail FROM Address</label>
             <p>This sets the address from which this app sends email. This app is already configured to send mail using {{app.domain}}'s <a ng-href="/#/email/{{ app.domain }}">Outbound Email</a> settings.</p>
 
-            <fieldset>
-              <form role="form" name="emailForm" ng-submit="email.submit()" autocomplete="off">
+            <form role="form" name="emailForm" ng-submit="email.submit()" autocomplete="off">
+              <fieldset>
                 <!-- recvmail currently only works with cloudron email -->
                 <div class="form-group" ng-class="{ 'has-error': emailForm.$dirty && email.error.mailboxName }">
                   <div ng-show="email.error.mailboxName">{{ email.error.mailboxName }}</div>
@@ -778,8 +778,8 @@
                   <br/>
                 </div>
                 <input class="ng-hide" type="submit" ng-disabled="(email.currentMailboxDomainName === email.mailboxDomain.domain && email.currentMailboxName === email.mailboxName) || email.busy || app.error || app.taskId"/>
-              </form>
-            </fieldset>
+              </fieldset>
+            </form>
           </div>
         </div>
         <div class="row">
@@ -794,8 +794,8 @@
       <div class="card" ng-show="view === 'security'">
         <div class="row">
           <div class="col-md-12">
-            <fieldset>
-              <form role="form" name="securityForm" ng-submit="security.submit()" autocomplete="off">
+            <form role="form" name="securityForm" ng-submit="security.submit()" autocomplete="off">
+              <fieldset>
                 <div class="form-group">
                   <label class="control-label" style="width: 100%">Robots.txt <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#robotstxt" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup> <a href="" class="pull-right" style="font-weight: normal;" ng-click="security.robotsTxt = ROBOTS_DISABLE_INDEXING_TEMPLATE">Disable indexing</a></label>
                   <textarea ng-model="security.robotsTxt" placeholder="Leave empty to allow all bots to index this app" class="form-control" rows="4"></textarea>
@@ -808,8 +808,8 @@
                 </div>
 
                 <input class="ng-hide" type="submit" ng-disabled="securityForm.$invalid || security.busy"/>
-              </form>
-            </fieldset>
+              </fieldset>
+            </form>
           </div>
         </div>
         <br/>