Additional cleanup of window output functions.
Switching to use dialog window where appropriate.