Still trying to fix overscroll