Further Windows adjustments