template and html updates