Fix layout issue caused by rebase