initial changes to the menu
Merge branch 'master' of https://github.com/thruthesky/x