layouts and dependencies
fixes conflicts