Improved menu-related stuff