Layout tweaks
Merge pull request #64 from ollieh/master

Layout tweaks