Improve Policy window