More removal of site manager and fix for rendering containers.