More work on edit modalities
Merge branch 'master' of https://github.com/Organization-Of-MelSol/Web