Fix fallout of reorganizing code
Remove changes that hid parts of edit form