UI-2579: Calendar Settings - Displayed Calendar Layout is incorrect