Moved getCalendar method into base controller
Containerising some templates