Fixed issues with schedule toggling