fix scroll
merge with jordan