Refactored server menu and main window class