diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 2eff53ddf..239239fc4 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -150,7 +150,7 @@
 		<md-tooltip md-delay="2000">{{folder.name}}</md-tooltip>
 	      </p>
               <md-input-container class="md-flex"
-                                  ng-show="app.editMode==folder.id">
+                                  ng-show="app.editMode == folder.id">
                 <input class="sg-item-name" type="text"
                        label:aria-label="Name of the Address Book"
                        ng-model="folder.name"
@@ -161,7 +161,7 @@
                        sg-escape="app.revertEditing(folder)"/>
               </md-input-container>
               <md-menu class="md-secondary"
-                       ng-show="app.service.selectedFolder.id==folder.id">
+                       ng-show="app.service.selectedFolder.id == folder.id">
                 <md-icon label:aria-label="Options"
                          ng-click="$mdMenu.open()"
                          md-menu-origin="md-menu-origin">more_vert</md-icon>
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 7b159d31d..4a8cc4eea 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -83,7 +83,9 @@
 	    </var:if>
             
             <div layout="row" layout-align="center center">
-              <md-switch class="md-accent md-hue-2" ng-model="app.creds.rememberLogin" label:arial-label="Remember username">
+              <md-switch class="md-accent md-hue-2"
+                         ng-model="app.creds.rememberLogin"
+                         label:arial-label="Remember username">
                 <var:string label:value="Remember username"/>
               </md-switch>
             </div>
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 673ab9f15..3556621b8 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -312,6 +312,7 @@
           </md-list>
         </section>
       </md-content>
+      <!-- Bottom filter + reorder toolbar -->
       <md-toolbar class="sg-toolbar-multiple sg-toolbar-tools--dense">
         <div class="md-toolbar-tools sg-toolbar-tools--dense"
              md-colors="::{backgroundColor: 'background-500'}"
diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js
index bdc1414cc..19739612b 100644
--- a/UI/WebServerResources/js/Mailer/MailboxesController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxesController.js
@@ -391,19 +391,19 @@
 
     function metadataForFolder(folder) {
       if (folder.type == 'inbox')
-        return {name: folder.name, icon:'inbox', special: true};
+        return {name: folder.name,           icon:'inbox',          special: true};
       else if (folder.type == 'draft')
-        return {name: l('DraftsFolderName'), icon: 'drafts', special: true};
+        return {name: l('DraftsFolderName'), icon: 'drafts',        special: true};
       else if (folder.type == 'sent')
-        return {name: l('SentFolderName'), icon: 'send', special: true};
+        return {name: l('SentFolderName'),   icon: 'send',          special: true};
       else if (folder.type == 'trash')
-        return {name: l('TrashFolderName'), icon: 'delete', special: true};
+        return {name: l('TrashFolderName'),  icon: 'delete',        special: true};
       else if (folder.type == 'junk')
-        return {name: l('JunkFolderName'), icon: 'thumb_down', special: true};
+        return {name: l('JunkFolderName'),   icon: 'thumb_down',    special: true};
       else if (folder.type == 'additional')
-        return {name: folder.name, icon: 'folder_shared', special: true};
+        return {name: folder.name,           icon: 'folder_shared', special: true};
 
-      return {name: folder.name, icon: 'folder_open', special: false};
+      return {name: folder.name,             icon: 'folder_open',   special: false};
     }
 
     function setFolderAs(folder, type) {