Merge pull request #159 from seuros/icons

Fix layouts
Arrange top menu