Cleaned up main window