Menu refactoring/rework; Gorgeous fixes;