[FIX] Calendar filter and layout

Implements [ticket 3004](https://www.openproject.org/work_packages/3004) and [ticket 3010](https://www.openproject.org/work_packages/3010)