Improve Layouts
Merge pull request #10 from angelino/improve_layout

Improve Layouts