Applying some refactoring on Dialogs

Created AddDialog and ChangeDialog