diff --git a/lib/book.js b/lib/book.js
index 27a609cf9..343a340c5 100644
--- a/lib/book.js
+++ b/lib/book.js
@@ -6,6 +6,7 @@ var fs = require("./utils/fs");
 var parseNavigation = require("./utils/navigation");
 var parseProgress = require("./utils/progress");
 var pageUtil = require("./utils/page");
+var summaryUtil = require("./utils/summary");
 
 var Configuration = require("./configuration");
 var TemplateEngine = require("./template");
@@ -270,7 +271,7 @@ Book.prototype.parseSummary = function() {
 		});
 	})
 	.then(function(summary) {
-		that.summary = summary;
+		that.summary = summaryUtil.normalize(summary);
 		that.navigation = parseNavigation(that.summary, that.files);
 	});
 };
diff --git a/lib/generators/site.js b/lib/generators/site.js
index 5eb8782c1..242e153b1 100644
--- a/lib/generators/site.js
+++ b/lib/generators/site.js
@@ -75,6 +75,9 @@ Generator.prototype.prepareTemplates = function() {
 
     // Add filter
     this.env.addFilter("contentLink", this.contentLink.bind(this));
+    this.env.addFilter('lvl', function(lvl) {
+        return lvl.split(".").length;
+    });
 
     // Add extension
     this.env.addExtension('ParentExtension', new ParentExtension());
diff --git a/theme/templates/ebook/includes/exercise.html b/theme/templates/ebook/includes/exercise.html
deleted file mode 100644
index 96a2c0a68..000000000
--- a/theme/templates/ebook/includes/exercise.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="exercise-header">Exercise</div>
-<div class="exercise-inner">
-    {% autoescape false %}{{ section.content }}{% endautoescape %}
-</div>
-<div class="exercise-inner">
-    <pre><code>{% autoescape false %}{{ section.code.base|code }}{% endautoescape %}</code></pre>
-</div>
-<hr>
-<div class="exercise-inner">
-    <pre><code>{% autoescape false %}{{ section.code.solution|code }}{% endautoescape %}</code></pre>
-</div>
diff --git a/theme/templates/ebook/includes/quiz.html b/theme/templates/ebook/includes/quiz.html
deleted file mode 100644
index ada363c32..000000000
--- a/theme/templates/ebook/includes/quiz.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="exercise-header">Quiz</div>
-<div class="exercise-inner">{% autoescape false %}{{ section.content }}{% endautoescape %}</div>
-{% for quiz in section.quiz %}
-<div class="question exercise-inner">
-    <div class="question-header">Question {{ loop.index }} of {{ section.quiz.length }}</div>
-
-    <div class="question-base">
-    {% autoescape false %}{{ quiz.base }}{% endautoescape %}
-    </div>
-    <div class="question-solution">
-    {% autoescape false %}{{ quiz.solution }}{% endautoescape %}
-    </div>
-</div>
-{% endfor %}
diff --git a/theme/templates/ebook/page.html b/theme/templates/ebook/page.html
index 86f0df869..0951c2732 100644
--- a/theme/templates/ebook/page.html
+++ b/theme/templates/ebook/page.html
@@ -23,10 +23,6 @@
         <div class="{{ section.type }}" id="section-{{ section.id }}">
         {% if section.type == "normal" %}
             {% autoescape false %}{{ section.content }}{% endautoescape %}
-        {% elif section.type == "exercise" %}
-            {% include "./includes/exercise.html" with {section: section} %}
-        {% elif section.type == "quiz" %}
-            {% include "./includes/quiz.html" with {section: section} %}
         {% endif %}
         </div>
     {% endfor %}
diff --git a/theme/templates/website/langs.html b/theme/templates/website/langs.html
index 7b47fc509..25ef7a82e 100755
--- a/theme/templates/website/langs.html
+++ b/theme/templates/website/langs.html
@@ -14,7 +14,7 @@
         <ul class="languages">
         {%  for lang in langs %}
             <li>
-                <a href="{{ basePath}}/{{ lang.path|pathJoin("/index.html") }}">{{ lang.title }}</a>
+                <a href="{{ basePath}}/{{ lang.lang }}/index.html">{{ lang.title }}</a>
             </li>
         {% endfor %}
         </ul>