refactoring schedule view shit