Improve main window