refactor forms.py and minor fixes