Added forms to views
Merge branch 'feature' into develop