Updated: Template fixes