menu fixes
Merge branch 'master' of https://github.com/askaza/fortuna-code
stuff