Implement new template logic for container page