Refactor, Code Cleanup (Fixed scrolling issues)