Improved the layout of a couple of places.