We have added additional Refresh logic to make the window more responsive.