Revert "Removed pointless layouts"

This reverts commit ffd311c10b93da35dc30617e172019ca41322e8d.