Minor improvements to the layout.