Changed the ordering of layout.