Make menus more usable and add icons
Merge pull request #35 from pajcho/development

Make menus more usable and add icons