REFACTOR: hoist layouts