refactoring the subject forms and adding some text and number helpers to the demo views