Menu code formating

Created originally on Bitbucket by Audionut

Changesets for this Pull Request have not been imported, because it had been already declined on Bitbucket. Marked as closed by the import user.

My attempt at some consistency in the menu code formatting.

Initial start, lots to do, will approve when I think I'm finished.

Pull request started for code review before I go to far.