UI updates
Merge branch 'develop' of https://github.com/patrikfritzner/BoredAtLecture into develop