More work on the edit dialog