refactoring error blocks.
more tweaking with error blocks.
cleaning up structure of forms.
Merge branch 'master' into prod