Updated menu and sub-menu
Merge branch 'master' of https://github.com/justingodard/ahsaptaf