refactored my schedule page