Updated mainwindow