T807-0 Fix dialogs (they aren't really modal anymore, e.g. overlapping toolbars)