fixed spacing in calendar_controller, did some clean up