CalendarToday: Fixing tests and layout; reverted change for "calendar" working