Minor gfx fixes for main window