azkaban-uncached

diff --git a/src/java/azkaban/webapp/servlet/velocity/schedulepanel.vm b/src/java/azkaban/webapp/servlet/velocity/schedulepanel.vm
index b0e58e8..3381d91 100644
--- a/src/java/azkaban/webapp/servlet/velocity/schedulepanel.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/schedulepanel.vm
@@ -28,10 +28,10 @@
 							<fieldset class="form-horizontal">
 								<div class="form-group">
                   <label class="col-sm-2 control-label">Time</label>
-                  <div class="col-sm-8">
+                  <div class="col-sm-7">
                     <input type="text" id="timepicker" class="form-control">
                   </div>
-                  <div class="col-sm-2">
+                  <div class="col-sm-3">
                     <select id="timezone" class="form-control">
                       <option>${timezone}</option>
                       <option>UTC</option>
@@ -55,7 +55,7 @@
                   <div class="col-sm-2">
                     <input id="period" type="text" size="2" value="1" class="form-control">
                   </div>
-                  <div class="col-sm-2">
+                  <div class="col-sm-3">
                     <select id="period_units" class="form-control">
                       <option value="d">Days</option>
                       <option value="h">Hours</option>

diff --git a/src/web/js/azkaban.schedule.panel.view.js b/src/web/js/azkaban.schedule.panel.view.js
index bcd8ccd..aa73f31 100644
--- a/src/web/js/azkaban.schedule.panel.view.js
+++ b/src/web/js/azkaban.schedule.panel.view.js
@@ -39,12 +39,12 @@ azkaban.SchedulePanelView = Backbone.View.extend({
 	},
 	
 	scheduleFlow: function() {
-		var hourVal = $('#hour').val();
-		var minutesVal = $('#minutes').val();
-		var ampmVal = $('#am_pm').val();
+    var timeVal = $('#timepicker').val();
 		var timezoneVal = $('#timezone').val();
+
 		var dateVal = $('#datepicker').val();
-		var is_recurringVal = $('#is_recurring').val();
+		
+    var is_recurringVal = $('#is_recurring').val();
 		var periodVal = $('#period').val();
 		var periodUnits = $('#period_units').val();
 	
@@ -53,9 +53,10 @@ azkaban.SchedulePanelView = Backbone.View.extend({
 
 		console.log("Creating schedule for " + projectName + "." + 
 				scheduleData.flow);
+
+    var scheduleTime = moment(timeVal, 'h/mm A').format('h,mm,A,') + timezoneVal;
+    console.log(scheduleTime);
 		
-		var scheduleTime = $('#hour').val() + "," + $('#minutes').val() + "," + 
-				$('#am_pm').val() + "," + $('#timezone').val();
 		var scheduleDate = $('#datepicker').val();
 		var is_recurring = document.getElementById('is_recurring').checked 
 				? 'on' : 'off';