Improvements to menus

Screenshots: http://i.imgur.com/RA50juM.png http://i.imgur.com/ZzU7aYi.png http://i.imgur.com/VHE2B2P.png http://i.imgur.com/vB6NSc7.png http://i.imgur.com/aej15T5.png

Signed-off-by: Steven Downer <grinch@outlook.com>