minor updates and cleaning to mainwindow