Tidy up calendar controllers and add an action to go to the current week