fix view  dialog and design of dialogs list
merge conflict
merge fix
fix merge