Some minor fixes to layout.