Changes for Scheduler UI 16-09-16:17