Refactored JS, and added Velocity.js