update layout
Merge pull request #1 from mogeta/feature/update_layout

Feature/update layout