Refactor
Fix scrolling bug