Finally fix the layout inconsistency