Moved the refresh logic into the ViewWillDisplay