#10 Improve reaction for buttons in main window