More tweaks to layout.