updated template and admin form