Revert "Content on most pages and layout updates"

This reverts commit 474da3433f8fa56de44dbe866ad517cf0f6518f8.