Reorder the layout to match the changed order of the code