Improve the layout a bit.