12th Commit - Menu improvements