Layout tweaks, fixing oversights.