Edit calendar layout
Fixed Schedule Shift
Merge branch 'new_calendar' into development