diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
index 333539a3f..3734cf506 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
@@ -61,7 +61,7 @@
               <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="sg-padded--top"
                             layout="row"
@@ -92,7 +92,6 @@
             </div>
           </div>
           <!-- send appointment notifications -->
-          <md-input-container>
           <md-checkbox
               ng-model="editor.component.sendAppointmentNotifications"
               ng-true-value="1"
@@ -100,9 +99,8 @@
               label:aria-label="Send Appointment Notifications">
             <var:string label:value="Send Appointment Notifications"/>
           </md-checkbox>
-          </md-input-container>
           <!-- attach urls -->
-          <div class="attr" ng-repeat="attach in editor.component.attachUrls">
+          <div ng-repeat="attach in editor.component.attachUrls">
             <div layout="row" layout-align="start center">
               <md-button class="md-icon-button" type="button" ng-click="editor.component.deleteAttachUrl($index)">
                 <md-icon>remove_circle</md-icon>
@@ -229,17 +227,17 @@
         <div class="sg-form-section">
           <div layout="row" layout-align="start center">
             <md-icon>search</md-icon>
-            <md-autocomplete class="md-flex"
-                             label:md-floating-label="Invite Attendees"
-                             md-selected-item="attendeeToAdd"
-                             md-search-text="editor.searchText"
-                             md-selected-item-change="editor.addAttendee(card)"
-                             md-items="card in editor.cardFilter(editor.searchText)"
-                             md-item-text="card.empty"
-                             var:md-min-length="minimumSearchLength"
-                             md-delay="300"
-                             md-no-cache="true"
-                             sg-enter="editor.addAttendee(editor.searchText)">
+            <md-autocomplete
+                class="md-flex"
+                label:md-floating-label="Invite Attendees"
+                md-search-text="editor.searchText"
+                md-selected-item-change="editor.addAttendee(card)"
+                md-items="card in editor.cardFilter(editor.searchText)"
+                md-item-text="card.empty"
+                var:md-min-length="minimumSearchLength"
+                md-delay="300"
+                md-no-cache="true"
+                sg-enter="editor.addAttendee(editor.searchText)">
               <md-item-template>
                 <div class="md-contact-suggestion">
                   <span class="md-contact-name"
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
index 3c818aed5..893c6fe8f 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
@@ -55,7 +55,7 @@
               <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="sg-padded--top"
                             layout="row"
@@ -86,7 +86,7 @@
             </div>
           </div>
           <!-- attach urls -->
-          <div class="attr" ng-repeat="attach in editor.component.attachUrls">
+          <div ng-repeat="attach in editor.component.attachUrls">
             <div layout="row" layout-align="start center">
               <md-button class="md-icon-button" type="button" ng-click="editor.component.deleteAttachUrl($index)">
                 <md-icon>remove_circle</md-icon>
@@ -100,7 +100,7 @@
               </md-input-container>
             </div>
           </div>
-          <div class="md-layout-margin" layout="row" layout-align="start center">
+          <div layout="row" layout-align="start center">
             <md-button class="md-icon-button" type="button" ng-click="editor.addAttachUrl($event)">
               <md-icon>add_circle</md-icon>
             </md-button>
diff --git a/UI/WebServerResources/js/Scheduler/ComponentController.js b/UI/WebServerResources/js/Scheduler/ComponentController.js
index 3ef6307a4..f246bdf12 100644
--- a/UI/WebServerResources/js/Scheduler/ComponentController.js
+++ b/UI/WebServerResources/js/Scheduler/ComponentController.js
@@ -42,8 +42,7 @@
 
     // Autocomplete cards for attendees
     function cardFilter($query) {
-      AddressBook.$filterAll($query);
-      return AddressBook.$cards;
+      return AddressBook.$filterAll($query);
     }
 
     function newMessageWithAllRecipients($event) {