fixes #7, fixes #6, lots of improvements on a menu usability