Revert "updated layouts"

This reverts commit d11a45b08da956de4ece8240b2f5c8dd85e462e6.