Fix layout quirks