Window handling updates