#24 align menu items
Merge origin/master