Merge branch 'menu' into design
Merge branch 'design' of https://github.com/Dewwi/heisenberg into design