Moving the layout towards bootstrap. Not there yet, but it already looks
a lot nicer!