Menu handling and usability improvements - DO NOT MERGE YET

...rs. fixes issue #1855