added several improvements and corrected keyboard navigation
Merge pull request #3360 from masterbee/menu-improvements

added several improvements and corrected keyboard navigation