added update function
fixed loading button
fixed form
fixed merge conflicts
fixed tests
Merge branch 'feature/update-content' into develop