Added dialog
Few improvements was made