Issue #80, edit view and controller