Minor tweaks and cleaning up
Merge branch 'feature/Forms'