fixed dialog box
I think we have taken care of everything
Merge branch 'dialog-style'