GUI fixes for Windows