Better layout

This needs to go in a gem or something, though