More fixes to Windows GUI