Menu handling and usability improvements