Improvements to menus

Signed-off-by: Steven Downer <grinch@outlook.com>
Merge pull request #4 from Grinch/master

Improvements to menus