Cleaned up main window a bit