Some formatting fixes. SVN revision: 32987
dialogs around but hooked up differently. do these by hand. SVN revision: 31073