Some progress with edit dialog