Refactoring layout
Refactoring layout
Merge pull request #5 from atrites/layout_rework

Layout rework