Updated schedule layout
Merge conflicts