Bugs with edit forms fixed