Cleaned up Mainwindow a bit.