[MERGE] base_calendar: improve code style and view