Fixed Edit & Delete