Revert "Revert "Revert "Roll Back MainWindow"""

This reverts commit 143267a9dd0aebc32133c76a665b68c3dad0dae2.