Minor changes to edit screen.  Seems stable.