update edit form link and edit capabilities to fix functionality
Fix merge conflict
Merge branch 'edit_button'