Improve routing for AngularJS