Revert "Roll Back MainWindow"

This reverts commit 82cd75578de2e9c0caa5e8c3736ae752e95d31a4.
Revert "Revert "Roll Back MainWindow""

This reverts commit 690368caed38922510e0a008ce1174406f173585.