Implented new editing features