Fix layout issues introduced in merge