6 files changed, 29 insertions, 25 deletions
diff --git a/theme/templates/includes/book/progress.html b/theme/templates/includes/book/progress.html
index 176c95f..176c95f 100644..100755
--- a/theme/templates/includes/book/progress.html
+++ b/theme/templates/includes/book/progress.html
diff --git a/theme/templates/includes/book/quiz.html b/theme/templates/includes/book/quiz.html
index 939d5c0..c315a16 100644
--- a/theme/templates/includes/book/quiz.html
+++ b/theme/templates/includes/book/quiz.html
@@ -6,22 +6,31 @@
     {% autoescape false %}{{ section.content }}{% endautoescape %}
 </div>
 
+
 {% for quiz in section.quiz %}
-<div class="quiz">
-    {% autoescape false %}{{ quiz.base }}{% endautoescape %}
+<div class="question">
+    <div class="question-header">Question {{ loop.index }} of {{ section.quiz.length }}</div>
 
-    <div class="alert alert-success hidden">
-        <b>Correct!</b>
-    </div>
+    <div class="question-content">
+        <div class="alert alert-success hidden">
+            <b>Correct!</b>
+        </div>
+
+        <div class="alert alert-danger error-message hidden">
+            <p><b>Not quite!</b></p>
+            {% autoescape false %}{{ quiz.feedback }}{% endautoescape %}
+        </div>
 
-    <div class="alert alert-danger error-message hidden">
-        <p><b>Not quite!</b></p>
-        {% autoescape false %}{{ quiz.feedback }}{% endautoescape %}
+        <div class="question-inner">
+        {% autoescape false %}{{ quiz.base }}{% endautoescape %}
+        </div>
     </div>
-</div>
 
-<div class="hidden quiz-answers">
-    {% autoescape false %}{{ quiz.solution }}{% endautoescape %}
+    <div class="hidden question-answers">
+        <div class="question-inner">
+        {% autoescape false %}{{ quiz.solution }}{% endautoescape %}
+        </div>
+    </div>
 </div>
 {% endfor %}
 
diff --git a/theme/templates/includes/book/summary.html b/theme/templates/includes/book/summary.html
index cbed38c..638ec15 100644
--- a/theme/templates/includes/book/summary.html
+++ b/theme/templates/includes/book/summary.html
@@ -22,10 +22,10 @@
             <li {% if item._path == _input %}class="active"{% endif %} data-level="{{ item.level }}" {% if item.path %}data-path="{{ item.path|mdLink }}"{% endif %}>
                 {% if item.path %}
                 <a href="{{ basePath }}/{{ item.path|mdLink }}">
-                    <i class="fa fa-check"></i> <b>{{ item.level }})</b> {{ item.title }}
+                    <i class="fa fa-check"></i> <b>{{ item.level }}.</b> {{ item.title }}
                 </a>
                 {% else %}
-                <span><b>{{ item.level }})</b> {{ item.title }}</span>
+                <span><b>{{ item.level }}.</b> {{ item.title }}</span>
                 {% endif %}
                 {% if item.articles.length > 0 %}
                 <ul class="articles">
@@ -33,10 +33,10 @@
                         <li {% if article._path == _input %}class="active"{% endif %} data-level="{{ article.level }}" {% if article.path %}data-path="{{ article.path|mdLink }}"{% endif %}>
                             {% if article.path %}
                             <a href="{{ basePath }}/{{ article.path|mdLink }}">
-                                <i class="fa fa-check"></i> <b>{{ article.level }})</b> {{ article.title }}
+                                <i class="fa fa-check"></i> <b>{{ article.level }}.</b> {{ article.title }}
                             </a>
                             {% else %}
-                            <span><b>{{ article.level }})</b> {{ article.title }}</span>
+                            <span><b>{{ article.level }}.</b> {{ article.title }}</span>
                             {% endif %}
                         </li>
                     {% endfor %}
diff --git a/theme/templates/langs.html b/theme/templates/langs.html
index c3a628f..21bf64f 100644..100755
--- a/theme/templates/langs.html
+++ b/theme/templates/langs.html
@@ -5,7 +5,7 @@
 {% block content %}
 <div class="book-langs-index">
     <div class="inner">
-        <h1>{{ title }}</h1>
+        <h3>Choose a language</h3>
 
         <ul class="languages">
         {%  for lang in langs %}
diff --git a/theme/templates/layout.html b/theme/templates/layout.html
index 7f564b2..a231a8c 100644..100755
--- a/theme/templates/layout.html
+++ b/theme/templates/layout.html
@@ -32,14 +32,13 @@
         <meta name="apple-mobile-web-app-status-bar-style" content="black">
 
         <link rel="shortcut icon" href="{{ staticBase }}/images/favicon.ico" type="image/x-icon">
-
-        {% block style %}
-        <link rel="stylesheet" href="{{ staticBase }}/style.css">
-        {% endblock %}
         {% endblock %}
     </head>
     <body>
         {% block content %}{% endblock %}
+        {% block style %}
+        <link rel="stylesheet" href="{{ staticBase }}/style.css">
+        {% endblock %}
         {% block javascript %}
         <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.3/ace.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.3/mode-javascript.js"></script>
diff --git a/theme/templates/site.html b/theme/templates/site.html
index 8205323..901474c 100644
--- a/theme/templates/site.html
+++ b/theme/templates/site.html
@@ -2,11 +2,7 @@
 
 {% block title %}{{ progress.current.title }}{% parent %}{% endblock %}
 {% block content %}
-{% if githubId %}
-<div class="book" data-github="{{ githubId }}" data-level="{{ progress.current.level }}" data-basepath="{{ basePath }}" data-revision="{{ revision }}">
-{% else %}
-<div class="book" data-level="{{ progress.current.level }}" data-basepath="{{ basePath }}" data-revision="{{ revision }}">
-{% endif %}
+    <div class="book" {% if githubId %}data-github="{{ githubId }}"{% endif %} data-level="{{ progress.current.level }}" data-basepath="{{ basePath }}" data-revision="{{ revision }}">
     {% include "includes/book/header.html" %}
     {% include "includes/book/summary.html" %}
     <div class="book-body" tabindex="-1">