updated forms and views

changed around form model re: ephphatha’s suggestions