Re-order routes so ng-interactive matches...

Also - lined up the routes a bit