Edit modalities mostly done