Better edit dialog (still in progress)