integrated the new template
integrated the ui template