Windows Settings improvements