Fix separate each dialogs into own class, struct dialog has been removed