Better layout

This needs to go in a gem or something, though
Merge pull request #46 from pikesley/layouts

Better layout