Edit form improvement - part of #72
Merge pull request #104 from audreyr/edit-form-enhancements-72

Edit form improvement - part of #72