Reworking menu layout
Merge pull request #28 from joeflynn/menu

Reworking menu layout