Improvements on pull to refresh
Conflicts solved