More advances in EditDialog