further refactoring of BookingsGrid and Calendar.