Revert "Layout 1 Changes"

This reverts commit 542130476460b6c7b5ba25a8b73695550de33049.