Fix a small bug that happens when scrolling down fails right after scrolling up..
Fix a text bug
Gradle related changes