This is much more elegant

I think
Even better
Ooh nice
Derp
Merge pull request #47 from pikesley/layout-fixes

Layout fixes