Re-factored app scroll module
Continue to work through global base styles