Issue #57 Modify edit view