Fix schedule watchers, more sidebar functionality