Fix the build + 2 minor fixes

Notice that MainWindow now uses LayoutManager - see line 144