Tidy up layout a bit.