Fix various layout glitches