Fix some leftover layout issues