Fixed Edit Functionality