Fixed some additional issues with the UI for scheduling. There are still outstanding UI issues with duplication of some views.
Merge remote-tracking branch 'origin/master'