[cosmetic] Fix layout flow issue