Improve mainwindow interface