Revert "changed layout revert to here for previous _layout"

This reverts commit b5e4130f0c042511c062e31b67d6c6ff30580094.