Controller schedules
Merge branch 'back-end'
Small feedback
Events improve