Update forms to share common template