more work on Edit UI