A little less MainWindow

.. trying to remove it from as many headers as possible.