Revert babf4d2..f623209

This rolls back to commit babf4d243965beb79e9c350c676b7e30281350a7.
updated layout macaw