Windows fixing and various UI improvements