Very basic schedule page layout
Resolve merge conflicts