Fix some layout glitches.