Get latest changes to compile on Windows

Still bugs in display on Preview & Nutcracker tabs in Windows