Edit page working
Merge branch 'classroom/edit' into develop