Made all edit form consistent