Better management of context- and new-menu, fixes #23 and fixes #21