#1 - initial changes after UX overview of Menu