Merge StartupWindow into MainWindow.

This allowed me to delete StartupWindow and clean up MainWindow and App.