Cleaning & Route Refactors

The javascripts. Am I doing them right yet?

![selfie-0](http://i.imgur.com/kMNctRi.gif)