edit/create views revamped
Merge branch 'develop'