- subforms now open and close on the click event - fixed add and remove criteria to work with new subforms
- form cleanup
-divided criteria into sub form to handle multiple sets