Scheduling and time all done
Popups and transitions
Merging scheduling and time grids from master