[IMP] Add Delete button, Refactore editor code, Improve code