Fix layout inconsistencies