New UI design
Fixed UI
Merge branch 'UIbranch'

Merge in new UI and prevent scheduling glitch caused by unreachable event