diff --git a/_includes/header.html b/_includes/header.html
index d3d2384..406395a 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -5,7 +5,7 @@
     {%- assign page_paths = site.header_pages | default: default_paths -%}
     {%- assign titles_size = site.pages | map: 'title' | join: '' | size -%}
     {%- assign module_parts = page.url | split: "/" -%}
-    {%- assign module_name = module_parts[3] | default: "index" -%}
+    {%- assign module_name = page.id | default: page.title -%}
     {%- assign navigation = site.data.navigation['modules'] -%}
     {%- assign module = navigation[module_name] -%}
     <div class="site-title">
diff --git a/modules/collaboration/tmate.md b/modules/collaboration/tmate.md
index cc4c96a..b4d4c8f 100644
--- a/modules/collaboration/tmate.md
+++ b/modules/collaboration/tmate.md
@@ -1,4 +1,6 @@
 ---
+id: tmate
+title: Party in the terminal
 authors:
   - Daniel Bosk <dbosk@kth.se>
 ---
diff --git a/modules/editor/editor.md b/modules/editor/editor.md
index ecdfe38..1328ada 100644
--- a/modules/editor/editor.md
+++ b/modules/editor/editor.md
@@ -1,4 +1,6 @@
 ---
+id: editor
+title: Editors
 authors:
   - Daniel Bosk <dbosk@kth.se>
 ---
diff --git a/modules/git/git.md b/modules/git/git.md
index 57e0194..08fb9b7 100644
--- a/modules/git/git.md
+++ b/modules/git/git.md
@@ -1,4 +1,6 @@
 ---
+id: git
+title: Git
 authors:
   - Daniel Bosk <dbosk@kth.se>
   - Ric Glassey <glassey@kth.se>
diff --git a/modules/git_commits/commits.md b/modules/git_commits/commits.md
index a74a0e9..cf93178 100644
--- a/modules/git_commits/commits.md
+++ b/modules/git_commits/commits.md
@@ -1,3 +1,11 @@
+---
+id: commits
+title: Good commit messages
+authors:
+  - Amanda Berg
+  - Daniel Bosk
+---
+
 # Good commit messages
 
 This module tries to teach the core of good commit messages when working with 
diff --git a/modules/latex/latex.md b/modules/latex/latex.md
index 643ac67..3d832ec 100644
--- a/modules/latex/latex.md
+++ b/modules/latex/latex.md
@@ -1,4 +1,6 @@
 ---
+id: latex
+title: Writing reports with LaTeX
 authors:
   - Daniel Bosk <dbosk@kth.se>
 ---
diff --git a/modules/overview/overview.md b/modules/overview/overview.md
index 7e1b891..6bfa1fa 100644
--- a/modules/overview/overview.md
+++ b/modules/overview/overview.md
@@ -1,4 +1,6 @@
 ---
+id: overview
+title: Course overview
 authors:
   - Daniel Bosk <dbosk@kth.se>
 ---
diff --git a/modules/ssh/guide.md b/modules/ssh/guide.md
index 8216756..6cc11bb 100644
--- a/modules/ssh/guide.md
+++ b/modules/ssh/guide.md
@@ -1,4 +1,6 @@
 ---
+id: guide
+title: Guide to accessing the terminal
 authors:
   - Daniel Bosk <dbosk@kth.se>
 ---
diff --git a/modules/terminal/interfaces.md b/modules/terminal/interfaces.md
index 70c8575..e64b210 100644
--- a/modules/terminal/interfaces.md
+++ b/modules/terminal/interfaces.md
@@ -1,4 +1,6 @@
 ---
+id: interfaces
+title: Briefly on interfaces
 authors:
   - Daniel Bosk <dbosk@kth.se>
 ---
diff --git a/modules/terminal/terminal.md b/modules/terminal/terminal.md
index 4bc9575..18ec192 100644
--- a/modules/terminal/terminal.md
+++ b/modules/terminal/terminal.md
@@ -1,4 +1,6 @@
 ---
+id: terminal
+title: The terminal
 authors:
   - Daniel Bosk <dbosk@kth.se>
 ---