Bug 18 - arrange menu-items
Merge pull request #19 from evanxd/issue-18

Bug 18 - arrange menu-items