-Added $routeParams and fixed routes