Huge menu fixes, menu is done
Merge branch 'master' of https://github.com/greg-repo/dev-at-home