Revert "Layout change for xenoflora+misc changes."

This reverts commit 7bf2b0261074a7580536f36277865d205f00de5f.