Fixed ui changes for windows