Fix layout issues