diff --git a/publish.js b/publish.js
index 22f52f06..e2dfcfbc 100644
--- a/publish.js
+++ b/publish.js
@@ -251,6 +251,32 @@ function buildNav(members) {
         });
     }
 
+    if (members.modules.length) {
+        _.each(members.modules, function (v) {
+            nav.push({
+                type: 'module',
+                longname: v.longname,
+                name: v.name,
+                members: find({
+                    kind: 'member',
+                    memberof: v.longname
+                }),
+                methods: find({
+                    kind: 'function',
+                    memberof: v.longname
+                }),
+                typedefs: find({
+                    kind: 'typedef',
+                    memberof: v.longname
+                }),
+                events: find({
+                    kind: 'event',
+                    memberof: v.longname
+                })
+            });
+        });
+    }
+
     return nav;
 }
 
diff --git a/static/scripts/main.js b/static/scripts/main.js
index 2eeb19bb..8569b22e 100644
--- a/static/scripts/main.js
+++ b/static/scripts/main.js
@@ -30,7 +30,7 @@ $(function () {
     });
 
     // Show an item related a current documentation automatically
-    var filename = $('.page-title').data('filename').replace(/\.[a-z]+$/, '');
+    var filename = $('.page-title').data('filename').replace(/\.[a-z]+$/, '').replace("-", ":");
     var $currentItem = $('.navigation .item[data-name*="' + filename + '"]:eq(0)');
 
     if ($currentItem.length) {
@@ -66,4 +66,4 @@ $(function () {
             document.getElementsByTagName('BODY')[0].appendChild(s);
         });
     }
-});
\ No newline at end of file
+});