Edit modalities almost done

Just need to work out ID conflicts with comment saving
Merge branch 'master' of https://github.com/Organization-Of-MelSol/Web