Fixed edit and delete