Fixing up the layout a bit