diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 90fe8771f..6f92dfd33 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -78,6 +78,22 @@
                   <md-icon>more_vert</md-icon>
                 </md-button>
                 <md-menu-content width="2">
+                  <md-menu-item>
+                    <md-button ng-click="app.showOnly(calendar)">
+                      <var:string label:value="Show Only This Calendar"/>
+                    </md-button>
+                  </md-menu-item>
+                  <md-menu-item>
+                    <md-button ng-click="app.showAll()">
+                      <var:string label:value="Show All Calendars"/>
+                    </md-button>
+                  </md-menu-item>
+                  <md-menu-divider><!-- divider --></md-menu-divider>
+                  <md-menu-item>
+                    <md-button ng-click="app.showProperties(calendar)">
+                      <var:string label:value="Properties"/>
+                    </md-button>
+                  </md-menu-item>
                   <md-menu-item>
                     <md-button type="button" ng-click="app.editFolder(calendar)">
                       <var:string label:value="Rename"/>
@@ -88,6 +104,13 @@
                       <var:string label:value="Delete"/>
                     </md-button>
                   </md-menu-item>
+                  <md-menu-divider><!-- divider --></md-menu-divider>
+                  <md-menu-item>
+                    <md-button ng-click="app.showLinks(calendar)">
+                      <var:string label:value="Links to this Calendar"/>
+                    </md-button>
+                  </md-menu-item>
+                  <md-menu-divider><!-- divider --></md-menu-divider>
                   <md-menu-item>
                     <md-button ng-click="app.importCalendar($event, calendar)">
                       <var:string label:value="Import"/>
@@ -99,33 +122,11 @@
                     </md-button>
                   </md-menu-item>
                   <md-menu-divider><!-- divider --></md-menu-divider>
-                  <md-menu-item>
-                    <md-button ng-click="app.showOnly(calendar)">
-                      <var:string label:value="Show Only This Calendar"/>
-                    </md-button>
-                  </md-menu-item>
-                  <md-menu-item>
-                    <md-button ng-click="app.showAll()">
-                      <var:string label:value="Show All Calendars"/>
-                    </md-button>
-                  </md-menu-item>
-                  <md-menu-divider><!-- divider --></md-menu-divider>
-                  <md-menu-item>
-                    <md-button ng-click="app.showLinks(calendar)">
-                      <var:string label:value="Links to this Calendar"/>
-                    </md-button>
-                  </md-menu-item>
                   <md-menu-item>
                     <md-button ng-click="app.share(calendar)">
                       <var:string label:value="Sharing..."/>
                     </md-button>
                   </md-menu-item>
-                  <md-menu-divider><!-- divider --></md-menu-divider>
-                  <md-menu-item>
-                    <md-button ng-click="app.showProperties(calendar)">
-                      <var:string label:value="Properties"/>
-                    </md-button>
-                  </md-menu-item>
                 </md-menu-content>
               </md-menu>
             </md-list-item>
@@ -173,6 +174,11 @@
                   <md-icon>more_vert</md-icon>
                 </md-button>
                 <md-menu-content width="2">
+                  <md-menu-item>
+                    <md-button ng-click="app.showProperties(calendar)">
+                      <var:string label:value="Properties"/>
+                    </md-button>
+                  </md-menu-item>
                   <md-menu-item>
                     <md-button type="button" ng-click="app.editFolder(calendar)">
                       <var:string label:value="Rename"/>
@@ -189,12 +195,6 @@
                       <var:string label:value="Links to this Calendar"/>
                     </md-button>
                   </md-menu-item>
-                  <md-menu-divider><!-- divider --></md-menu-divider>
-                  <md-menu-item>
-                    <md-button ng-click="app.showProperties(calendar)">
-                      <var:string label:value="Properties"/>
-                    </md-button>
-                  </md-menu-item>
                 </md-menu-content>
               </md-menu>
             </md-list-item>
@@ -238,6 +238,11 @@
                   <md-icon>more_vert</md-icon>
                 </md-button>
                 <md-menu-content width="2">
+                  <md-menu-item>
+                    <md-button ng-click="app.showProperties(calendar)">
+                      <var:string label:value="Properties"/>
+                    </md-button>
+                  </md-menu-item>
                   <md-menu-item>
                     <md-button type="button" ng-click="app.editFolder(calendar)">
                       <var:string label:value="Rename"/>
@@ -254,12 +259,6 @@
                       <var:string label:value="Links to this Calendar"/>
                     </md-button>
                   </md-menu-item>
-                  <md-menu-divider><!-- divider --></md-menu-divider>
-                  <md-menu-item>
-                    <md-button ng-click="app.showProperties(calendar)">
-                      <var:string label:value="Properties"/>
-                    </md-button>
-                  </md-menu-item>
                 </md-menu-content>
               </md-menu>
             </md-list-item>
diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
index 174ff56f9..689c4fdfd 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox
@@ -6,7 +6,7 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:label="OGo:label"
     >
-  <md-dialog flex-xs="100">
+  <md-dialog flex="50" flex-sm="70" flex-xs="100">
 
     <md-toolbar ng-class="properties.calendar.getClassName('bg')">
       <div class="md-toolbar-tools">
@@ -25,7 +25,8 @@
       </div>
     </md-toolbar>
 
-    <md-dialog-content class="md-dialog-content" layout="column">
+    <md-dialog-content class="sg-has-form-sections">
+        <div class="sg-form-section" layout="column">
       <md-checkbox
           ng-model="properties.calendar.includeInFreeBusy"
           ng-true-value="1"
@@ -59,8 +60,8 @@
           ng-false-value="0">
         <var:string label:value="Reload on login"/>
       </md-checkbox>
-      <div ng-hide="properties.calendar.isWebCalendar || !properties.calendar.isOwned" layout="column">
-        <md-divider class="md-padding"><!-- divider --></md-divider>
+        </div>
+      <div class="sg-form-section" ng-hide="properties.calendar.isWebCalendar || !properties.calendar.isOwned" layout="column">
         <md-checkbox
             ng-model="properties.calendar.notifications.notifyOnPersonalModifications"
             ng-true-value="1"