More UX enhancements
Merge branch 'develop' of https://github.com/olab/Open-Labyrinth into develop