lots of form and view edits
Merge branch 'master' into products