Remove passing of container to caller and resolver. Update view layout references.