Menu refinements - still needs work