Few minor windows chnages