converted more forms to crispy_forms