Current WIP
Fixed scrolling fail!
Tidy up app.js