Fixing Problem of editing and deleting