More layout
Merge pull request #39 from pikesley/improve-layout

More layout