More tweaks to the layout.