Add angular-route and fix var names.