fix gui bugs for windows
Merge branch 'master' of github.com:anandbhat23/Project