added more missing logic to schedule view