diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
index 1d524ea08..39440a905 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
@@ -15,12 +15,10 @@
             <label><var:string label:value="Title"/></label>
             <input type="text"
                    class="md-title"
+                   md-autofocus="true"
                    ng-model="editor.component.summary"
                    required="required"/>
           </md-input-container>
-          <md-button class="md-icon-button" ng-click="editor.cancel()">
-            <md-icon aria-label="Close dialog">close</md-icon>
-          </md-button>
         </div>
       </md-toolbar>
       <md-dialog-content class="sg-has-form-sections">
@@ -56,9 +54,9 @@
               <span md-highlight-text="editor.categories.searchText">{{category}}</span>
             </md-autocomplete>
           </md-chips>
-          <div layout="row" layout-align="space-between end" layout-wrap="layout-wrap">
+          <div layout="row" layout-align="space-between center" layout-wrap="layout-wrap">
             <!-- classification -->
-            <md-radio-group class="md-padding" layout="row"
+            <md-radio-group layout="row"
                             ng-model="editor.component.classification">
               <md-radio-button value="public">
                 <var:string label:value="label_Public"/>
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
index 3ad9b5240..5b0bd694b 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
@@ -269,12 +269,33 @@
         </md-menu-content>
       </md-menu>
       <div class="md-flex"><!-- spacer --></div>
-      <md-button type="button" ng-click="editor.replyAllOccurrences()">
+      <!-- On larger screens, show both buttons -->
+      <md-button type="button" class="hide-xs" ng-click="editor.replyAllOccurrences()">
         <var:string label:value="Update All Occurrences"/>
       </md-button>
-      <md-button type="button" ng-click="editor.reply()">
+      <md-button type="button" class="hide-xs" ng-click="editor.reply()">
         <var:string label:value="Update This Occurrence"/>
       </md-button>
+      <!-- On small screens, show a md-menu with the two choices -->
+      <md-menu class="hide show-xs">
+        <md-button label:aria-label="Update"
+                   ng-click="$mdOpenMenu()"
+                   md-menu-origin="md-menu-origin">
+          <var:string label:value="Update"/>
+        </md-button>
+        <md-menu-content>
+          <md-menu-item>
+            <md-button type="button" ng-click="editor.replyAllOccurrences()">
+              <var:string label:value="Update All Occurrences"/>
+            </md-button>
+            </md-menu-item>
+            <md-menu-item>
+              <md-button type="button" ng-click="editor.reply()">
+                <var:string label:value="Update This Occurrence"/>
+              </md-button>
+            </md-menu-item>
+        </md-menu-content>
+      </md-menu>
     </md-dialog-actions>
   </md-dialog>
 </container>
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
index 8d997bfb5..14ed97b72 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
@@ -15,12 +15,10 @@
             <label><var:string label:value="Title"/></label>
             <input type="text"
                    class="md-title"
+                   md-autofocus="true"
                    ng-model="editor.component.summary"
                    required="required"/>
           </md-input-container>
-          <md-button class="md-icon-button" ng-click="editor.cancel()">
-            <md-icon aria-label="Close dialog">close</md-icon>
-          </md-button>
         </div>
       </md-toolbar>
       <md-dialog-content class="sg-has-form-sections">
@@ -56,9 +54,9 @@
               <span md-highlight-text="editor.categories.searchText">{{category}}</span>
             </md-autocomplete>
           </md-chips>
-          <div layout="row" layout-align="space-between end" layout-wrap="layout-wrap">
+          <div layout="row" layout-align="space-between center" layout-wrap="layout-wrap">
             <!-- classification -->
-            <md-radio-group class="md-padding" layout="row"
+            <md-radio-group layout="row"
                             ng-model="editor.component.classification">
               <md-radio-button value="public">
                 <var:string label:value="label_Public"/>