Improved contribution edit form

  . Fix issue #23 and #24