Re-Fixed some bugs that came back with e8949ca284d91ddc5a6afc3397d21a6635a3e80a
fixed gui freeze on windows when adding hosts