Fix layout error caused by last commit