Added editing class and fixed deleting classes