Scheduler fix, with minro JS tweaks for return button