More win ui fixes