Merge pull request #2993 from thedax/win32UICleanup

Win32 UI: Yet another cleanup pullrq
Rebase and rewrite VPS option.