added fixes on template