major menu unification, minor reorganization