Fixed edit, delete bug