formatting cleanup
menu data structure refactoring: no dummy root node
Merge branch 'master' into beta