Issue #160 - Edit UI