diff --git a/html/timesheet_canvas_v1.html b/html/timesheet_canvas_v1.html
index 6634a22..b9a32bf 100644
--- a/html/timesheet_canvas_v1.html
+++ b/html/timesheet_canvas_v1.html
@@ -32,7 +32,7 @@
     </div>
     <div class='timesheets'>
         <div class='sheettitle titlebar_gradient'>
-            <h1>Web Office -  Today:<span name='today'> Today </span> </h1>
+            <h1>Web Office -  Today:<span name='today'> Today </span> &nbsp; &nbsp;  <a style="float:right;margin-right:20px;" href="/time-sheets/"> (Old Version) </a> </h1>
         </div>
         <div class='sheetsheader'>
             <div class='weekly'>
diff --git a/js/bts_office.js b/js/bts_office.js
index 15f58e5..8d081bc 100644
--- a/js/bts_office.js
+++ b/js/bts_office.js
@@ -726,6 +726,7 @@
 				});
 				this.el.find("div.bfinish input").change(function(){
 					if (self.validate_finish()){
+						console.log(self);
 						self.data.finish = self.get_finish();
 						self.set_err_msg_finish('');
 						self.validate_start_and_finish();
@@ -812,7 +813,7 @@
 				}
 			}
 			get_start(){
-				return this.el.find('div.bstart input').attr('value');
+				return this.el.find('div.bstart input').val();
 			}
 			set_start(val)
 			{
@@ -820,11 +821,11 @@
 					this.set_err_msg_start("need start");
 					return;
 				}
-				this.el.find('div.bstart input').attr('value', val);
+				this.el.find('div.bstart input').val(val);
 			}
 			get_finish()
 			{
-				return this.el.find('div.bfinish input').attr('value');
+				return this.el.find('div.bfinish input').val();
 			}
 			set_finish(val)
 			{
@@ -832,7 +833,7 @@
 					this.set_err_msg_finish("need finish");
 					return;
 				}
-				this.el.find('div.bfinish input').attr('value', val);
+				this.el.find('div.bfinish input').val(val);
 			}
 			get_rate()
 			{
@@ -1270,11 +1271,11 @@
 		}
 		
 		function set_working_hours(num){
-			$('input#woh').attr('value', num);
+			$('input#woh').val(num);
 		}
 		
 		function get_working_hours(){
-			var txt = $('input#woh').attr('value');
+			var txt = $('input#woh').val();
 			return parseFloat(txt);
 		}
 	
@@ -1396,9 +1397,9 @@
 		function set_week_boundry()
 		{
 			var date = $('span[name="w1d1"]').data().date;
-			$('#week1b').attr('value', format_date(date));
+			$('#week1b').val(format_date(date));
 			var date = $('span[name="w2d7"]').data().date;
-			$('#week2b').attr('value', format_date(date));
+			$('#week2b').val(format_date(date));
 		}
 		
 		function number_of_unsaved_job(){
@@ -1444,7 +1445,7 @@
 			e.stopPropagation();
 		});		
 		$('div.weekly div.weekname.prev >input ').change(function(e){
-			var date = $('#week1b').attr('value');
+			var date = $('#week1b').val();
 			init_weekdays_by_anchor(date, true);
 			set_week_number();
 			debounced_load_timesheet();
@@ -1483,7 +1484,7 @@
 		
 		$('div.weekly div.weekname.next >input ').change(function(e){
 			e.stopPropagation();
-			var date = $('#week2b').attr('value');
+			var date = $('#week2b').val();
 			init_weekdays_by_anchor(date, false);
 			set_week_number();
 			debounced_load_timesheet();
@@ -2370,12 +2371,12 @@
 		function save_unsaved_copy(event)
 		{ 
 			event.preventDefault();
-			var num = $('div.jobTable.dirty').length;
+			var num = $('div.jobTable.dirty:visible').length;
 			if (num > 0){
 				if ( !confirm('save all '+ num + ' jobs?')){
 					return;
 				}
-				$('div.jobTable.dirty').each(function(){
+				$('div.jobTable.dirty:visible').each(function(){
 					$(this).find('span.ticon.ticon-save').trigger('click');
 				})
 			}else{
@@ -2385,12 +2386,12 @@
 		$('div.divTableHeading div.bsave span.ticon-save').contextmenu(function(event){
 			//clearn all unsaved jobs.
 			event.preventDefault();
-			var num = $('div.jobTable.dirty').length;
+			var num = $('div.jobTable.dirty:visible').length;
 			if (num > 0){
 				if ( !confirm('delete all '+ num + ' unsaved?')){
 					return;
 				}
-				$('div.jobTable.dirty').each(function(){
+				$('div.jobTable.dirty:visible').each(function(){
 					var newjob_id = $(this).data().newjob_id;
 					delete bts().job_map_new[newjob_id]
 					$(this).remove();