Revert "reverse layout"

This reverts commit fcb37af956a329179943e8d4b01a0875890e5872.