diff --git a/awx/ui/client/src/helpers/Schedules.js b/awx/ui/client/src/helpers/Schedules.js
index fe67527d1d..dcf1577a6a 100644
--- a/awx/ui/client/src/helpers/Schedules.js
+++ b/awx/ui/client/src/helpers/Schedules.js
@@ -88,24 +88,6 @@ export default
                     }
                 }
 
-                if (scope.removeDialogReady) {
-                    scope.removeDialogReady();
-                }
-                scope.removeDialogReady = scope.$on('DialogReady', function() {
-                    $('#scheduler-modal-dialog').dialog('open');
-                    $('#schedulerName').focus();
-                    setTimeout(function() {
-                        scope.$apply(function() {
-                            scheduler.setRRule(schedule.rrule);
-                            scheduler.setName(schedule.name);
-                            if(scope.isFactCleanup || scope.cleanupJob){
-                                setGranularity();
-                            }
-
-                        });
-                    }, 300);
-                });
-
                 if (scope.removeScheduleFound) {
                     scope.removeScheduleFound();
                 }
@@ -126,6 +108,12 @@ export default
                         $rootScope.$broadcast("ScheduleFormCreated", scope);
                     });
                     scope.showRRuleDetail = false;
+
+                    scheduler.setRRule(schedule.rrule);
+                    scheduler.setName(schedule.name);
+                    if(scope.isFactCleanup || scope.cleanupJob){
+                        setGranularity();
+                    }
                 });
 
 
diff --git a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
index 1ec9de5056..ce8bad2009 100644
--- a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
@@ -172,6 +172,12 @@
                             ng-show="sheduler_frequency_error">
                         </div>
                     </div>
+                    <div class="form-group SchedulerForm-formGroup" ng-if="cleanupJob  && !isFactCleanup">
+                        <label class="Form-inputLabel"><span class="red-text">*</span> Days of data to keep</label>
+                        <input type="number" sch-spinner="scheduler_form" class="scheduler-time-spinner SchedulerTime-input SpinnerInput RepeatFrequencyOptions-number" name="schedulerPurgeDays" id="schedulerPurgeDays" min="1" ng-model="schedulerPurgeDays" required placeholder="Days of data to keep">
+                        <div class="error" ng-show="scheduler_form.schedulerPurgeDays.$dirty && scheduler_form.schedulerPurgeDays.$error.required">A value is required.</div>
+                        <div class="error" ng-show="scheduler_form.schedulerPurgeDays.$error.number">This is not a valid number.</div>
+                    </div>
                     <div class="RepeatFrequencyOptions-label"
                         ng-show="schedulerFrequency.value && schedulerFrequency.value !== 'none'">
                         Frequency Details</div>
@@ -531,44 +537,29 @@
                     <span class="factDetailsHeader">Note:</span> For facts collected older than the time period specified, save one fact scan (snapshot) per time window (frequency). For example, facts older than 30 days are purged, while one weekly fact scan is kept.
                     Caution: Setting both numerical variables to "0" will delete all facts.</div>
 
-                    <div class="form-group" ng-if="cleanupJob  && !isFactCleanup">
-                        <label class="Form-inputLabel"><span class="red-text">*</span> Days of data to keep</label>
-                        <input type="number" class="form-control input-sm" name="schedulerPurgeDays" id="schedulerPurgeDays" min="1" ng-model="schedulerPurgeDays" required placeholder="Days of data to keep">
-                        <div class="error" ng-show="scheduler_form.schedulerPurgeDays.$dirty && scheduler_form.schedulerPurgeDays.$error.required">A value is required.</div>
-                        <div class="error" ng-show="scheduler_form.schedulerPurgeDays.$error.number">This is not a valid number.</div>
-                    </div>
-
-                    <div class="form-group cleanupStretcher factDaysToKeepCompacter" ng-if="isFactCleanup">
-                        <div class="col-md-12">
-                            <label class="Form-inputLabel"><span class="red-text">*</span> Select a time period after which to remove old facts</label>
-                        </div>
-                        <div class="col-md-6 inputSpacer inputCompactMobile">
-                            <input type="number" id="keep_amount" name="keep_amount" ng-model="keep_amount" ng-required="true" class="form-control input-sm" aw-min=0 aw-max=9999 integer></input>
+                    <div class="form-group SchedulerForm-formGroup" ng-if="isFactCleanup">
+                        <label class="Form-inputLabel RepeatFrequencyOptions-everyLabel"><span class="red-text">*</span> Select a time period after which to remove old facts</label>
+                        <div class="RepeatFrequencyOptions-inputGroup RepeatFrequencyOptions-inputGroup--halvesWithSelect">
+                            <input type="number" id="keep_amount" name="keep_amount" ng-model="keep_amount" ng-required="true" sch-spinner="scheduler_form" class="scheduler-time-spinner SchedulerTime-input SpinnerInput RepeatFrequencyOptions-number" aw-min=0 aw-max=9999 integer></input>
                             <div class="error" ng-show="scheduler_form.keep_amount.$dirty && scheduler_form.keep_amount.$error.required">Please enter the number of days you would like to keep this data.</div>
                             <div class="error survey_error" ng-show="scheduler_form.keep_amount.$error.number || scheduler_form.keep_amount.$error.integer" >Please enter a valid number.</div>
                             <div class="error survey_error" ng-show="scheduler_form.keep_amount.$error.awMin">Please enter a non-negative number.</div>
                             <div class="error survey_error" ng-show="scheduler_form.keep_amount.$error.awMax">Please enter a number smaller than 9999.</div>
-                        </div>
-                        <div class="col-md-6 inputSpacer">
-                            <select id="keep_unit" name="keep_unit" ng-model="keep_unit" ng-options="type.label for type in keep_unit_choices track by type.value" ng-required="true" class="form-control input-sm"></select>
+                            <select id="keep_unit" name="keep_unit" ng-model="keep_unit" ng-options="type.label for type in keep_unit_choices track by type.value" ng-required="true" class="form-control input-sm MakeSelect2"></select>
                         </div>
                     </div>
 
-                    <div class="form-group cleanupStretcher" ng-if="isFactCleanup">
-                        <div class="col-md-12">
-                            <label class="Form-inputLabel"><span class="red-text">*</span> Select a frequency for snapshot retention</label>
-                        </div>
-                        <div class="col-md-6 inputSpacer inputCompactMobile">
-                            <input type="number" class="form-control input-sm" id="granularity_keep_amount" name="granularity_keep_amount" ng-model="granularity_keep_amount" ng-required="true" aw-min=0 aw-max=9999 >
+                    <div class="form-group SchedulerForm-formGroup" ng-if="isFactCleanup">
+                        <label class="Form-inputLabel RepeatFrequencyOptions-everyLabel"><span class="red-text">*</span> Select a frequency for snapshot retention</label>
+                        <div class="RepeatFrequencyOptions-inputGroup RepeatFrequencyOptions-inputGroup--halvesWithSelect">
+                            <input type="number" sch-spinner="scheduler_form" class="scheduler-time-spinner SchedulerTime-input SpinnerInput RepeatFrequencyOptions-number" id="granularity_keep_amount" name="granularity_keep_amount" ng-model="granularity_keep_amount" ng-required="true" aw-min=0 aw-max=9999 >
                             <div class="error" ng-show="scheduler_form.granularity_keep_amount.$dirty && scheduler_form.granularity_keep_amount.$error.required">Please enter the number of days you would like to keep this data.</div>
                             <div class="error survey_error" ng-show="scheduler_form.granularity_keep_amount.$error.number || scheduler_form.granularity_keep_amount.$error.integer" >Please enter a valid number.</div>
                             <div class="error survey_error" ng-show="scheduler_form.granularity_keep_amount.$error.awMin">Please enter a non-negative number.</div>
                             <div class="error survey_error" ng-show="scheduler_form.granularity_keep_amount.$error.awMax">Please enter a number smaller than 9999.</div>
+                            <select id="granularity_keep_unit" name="granularity_keep_unit" ng-model="granularity_keep_unit" ng-options="type.label for type in granularity_keep_unit_choices track by type.value" ng-required="true" class="form-control input-sm MakeSelect2"></select>
                         </div>
-                        <div class="col-md-6 inputSpacer">
-                            <select id="granularity_keep_unit" name="granularity_keep_unit" ng-model="granularity_keep_unit" ng-options="type.label for type in granularity_keep_unit_choices track by type.value" ng-required="true" class="form-control input-sm"></select>
-                        </div>
-                    </div> 
+                    </div>
                 <!-- end management job fields     -->
                 </form>
                 <div class="SchedulerFormDetail-container
diff --git a/awx/ui/client/src/scheduler/repeatFrequencyOptions.block.less b/awx/ui/client/src/scheduler/repeatFrequencyOptions.block.less
index 60051d07ab..a63189a798 100644
--- a/awx/ui/client/src/scheduler/repeatFrequencyOptions.block.less
+++ b/awx/ui/client/src/scheduler/repeatFrequencyOptions.block.less
@@ -162,3 +162,12 @@
     width: ~"calc(50% - 3px)" !important;
     margin-right: 7px;
 }
+
+.RepeatFrequencyOptions-inputGroup--halvesWithSelect > .select2 {
+    width: ~"calc(50% - 3px)" !important;
+    margin-left: 7px;
+}
+
+.RepeatFrequencyOptions-inputGroup--halvesWithSelect > .RepeatFrequencyOptions-number {
+    width: ~"calc(50% - 3px)" !important;
+}
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index 4846465091..36e94151d3 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -49,13 +49,13 @@ export default ['$compile', '$state', '$stateParams', 'EditSchedule', 'Wait', '$
     };
 
     // extra_data field is not manifested in the UI when scheduling a Management Job
-    if ($state.current.name !== ('managementJobSchedules.add' || 'managementJobSchedules.edit')){
+    if ($state.current.name !== 'managementJobSchedules.add' && $state.current.name !== 'managementJobSchedules.edit'){
         $scope.$on('ScheduleFound', function(){
-            ParseTypeChange({ 
-                scope: $scope, 
-                variable: 'extraVars', 
+            ParseTypeChange({
+                scope: $scope,
+                variable: 'extraVars',
                 parse_variable: 'parseType',
-                field_id: 'SchedulerForm-extraVars' 
+                field_id: 'SchedulerForm-extraVars'
             });
         });
     }