Changes to schedule
Fixed previous/next issues
Merged in origin/master