Menu improvements