Revert "Layout Changes"

This reverts commit 380664ffdec41940e01a9cfc75e0124c7edb7728.
Revert "Revert "Layout Changes""

This reverts commit aee6a92bb34337baf39289445e1817c0cedd0129.