Fixed Edit Toggling