Refactoring of menu and positioning
Merge pull request #28 from theponti/development

Refactoring of menu and positioning