diff --git a/app/assets/javascripts/property_hire_calendar_frontend.js b/app/assets/javascripts/property_hire_calendar_frontend.js
index 52a4a9c..47400f0 100644
--- a/app/assets/javascripts/property_hire_calendar_frontend.js
+++ b/app/assets/javascripts/property_hire_calendar_frontend.js
@@ -215,14 +215,17 @@ var Calendar = function(dom,property_id,currentView,display_hire_event){
 		c.nextBtn.click(function(){
 			c.dialog.dismiss();
 			c.calendar_dom.calendar.next();
+			c.title.text(c.calendar_dom.calendar.currentData.viewTitle);
 		});
 		c.prevBtn.click(function(){
 			c.dialog.dismiss();
 			c.calendar_dom.calendar.prev();
+			c.title.text(c.calendar_dom.calendar.currentData.viewTitle);
 		});
 		c.todayBtn.click(function(){
 			c.dialog.dismiss();
 			c.calendar_dom.calendar.today();
+			c.title.text(c.calendar_dom.calendar.currentData.viewTitle);
 		});
 		c.modeBtns.click(function(){
 			c.dialog.dismiss();
@@ -267,7 +270,8 @@ var Calendar = function(dom,property_id,currentView,display_hire_event){
 					viewTitle = $('.fc-col-header-cell-cushion ').text() + ', ' + viewTitle;
 				$('#current_title').html(viewTitle);
 			}
-			c.calendar_dom.calendar.render(); //Rerender to fix layout
+			c.title.text(c.calendar_dom.calendar.currentData.viewTitle);
+			// c.calendar_dom.calendar.rerenderEvents(); //Rerender to fix layout
 		};
 		if(c.currentView == "agenda"){toggleViews("agenda");loadeventsonviewchange = true;}
 	};