Fixed the issues with the template container