Fix layout collapse