Tidy up the layout a bit more