Refactor of Forms

Take out a parent class.
Minor tweaks outside.
Merge branch 'master' of https://github.com/vshulev/Code-For-Good-Team-16