Schedule complete, some changes to the ui still required
Merge remote-tracking branch 'origin/master'