changes to the schedulePanel etc.
changes to schedule and merge