All editing features working

Still bugs to be fixed