fixes for moving the form to forms.py