Fix some minor layout glitches.