fixed delete and edit