Cleanup app and mainwindow

Same response as for the reorders.