removed the define-view form in favor of the view form
Merge branch 'view-form' into dev