Fixed edit / added delete