Routes fixing
Adjustes javascripts
Added Waypoints
Routes fixing