Fix up Calendar Controller file