diff --git a/DependencyInjection/Services/MenuComposer.php b/DependencyInjection/Services/MenuComposer.php
index cef6ae100..3883e0291 100644
--- a/DependencyInjection/Services/MenuComposer.php
+++ b/DependencyInjection/Services/MenuComposer.php
@@ -29,11 +29,15 @@ class MenuComposer {
         $routes = array();
         
         foreach ($this->routeCollection->all() as $key => $route) {
-            if ($route['options']['menu'] === $menuId) {
-                $routes[$route['options']['order']] = $route;
+            if ($route->getOption('menu') === $menuId) {
+                $a['route'] = $key;
+                $a['label'] = $route->getOption('label');
+                $routes[$route->getOption('order')] = $a;
             }
         }
         
+        ksort($routes);
+        
         return $routes;
         
     }
diff --git a/Resources/assets/gumpy/bower_components/gumby/js/libs/ui/gumby.tabs.js b/Resources/assets/gumpy/bower_components/gumby/js/libs/ui/gumby.tabs.js
index 2a49d0b7a..4d6351c84 100644
--- a/Resources/assets/gumpy/bower_components/gumby/js/libs/ui/gumby.tabs.js
+++ b/Resources/assets/gumpy/bower_components/gumby/js/libs/ui/gumby.tabs.js
@@ -10,7 +10,7 @@
 		Gumby.debug('Initializing Tabs', $el);
 
 		this.$el = $el;
-		this.$nav = this.$el.find('ul.tab-nav > li');
+		this.$nav = this.$el.find('ul.tab-nav:not(.follow-href-path) > li');
 		this.$content = this.$el.find('.tab-content');
 
 		var scope = this;
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index 661af236e..0c6fca885 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -1,3 +1,7 @@
 cl_chill_main_homepage:
     pattern:  /hello
     defaults: { _controller: CLChillMainBundle:Default:index }
+    options:
+        menu: person
+        order: 0
+        label: HomePage
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index 827fccd64..4a137bb8c 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -5,7 +5,7 @@ services:
     menu_composer:
         class: CL\Chill\MainBundle\DependencyInjection\Services\MenuComposer
         arguments:
-            -  "@routing.loader"
+            -  "@router"
 #    cl_chill_main.example:
 #        class: %cl_chill_main.example.class%
 #        arguments: [@service_id, "plain_value", %parameter%]
diff --git a/Resources/public/js/ui/gumby.tabs.js b/Resources/public/js/ui/gumby.tabs.js
index 2a49d0b7a..4d6351c84 100644
--- a/Resources/public/js/ui/gumby.tabs.js
+++ b/Resources/public/js/ui/gumby.tabs.js
@@ -10,7 +10,7 @@
 		Gumby.debug('Initializing Tabs', $el);
 
 		this.$el = $el;
-		this.$nav = this.$el.find('ul.tab-nav > li');
+		this.$nav = this.$el.find('ul.tab-nav:not(.follow-href-path) > li');
 		this.$content = this.$el.find('.tab-content');
 
 		var scope = this;
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index 367648159..ed0c55ca8 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -153,7 +153,7 @@
 
      "bundles/clchillmain/js/gumby.init.js" 
      "bundles/clchillmain/js/ui/*.js" %}
-    <script src="{{ asset_url }}" type="text/javascript"></script>
+    <script gumby-debug src="{{ asset_url }}" type="text/javascript"></script>
 
 {% endjavascripts %}