Windows build and fix in menu