Final fixes for menus
Merge branch 'master' of github.com:Juzmach/hackathon-hk