Revert "Layout changes"

This reverts commit 4affa269554732a57c5432e607ca46a921a08df1.