Polished the layout a bit.