fixes scroll issue
Merge branch 'local2'