Cribbed from uncle-clive
Oops, don't need that one
This is even better
Of COURSE this
Merge pull request #16 from pikesley/layout-fixes

Layout fixes