Added solution control to main window