Menu setup
Merge branch 'master' of https://github.com/max-weller/labyrinth