Changes in the window setting and other small changes