diff --git a/theme/templates/includes/page/exercise.html b/theme/templates/includes/page/exercise.html
new file mode 100644
index 000000000..da47cc09c
--- /dev/null
+++ b/theme/templates/includes/page/exercise.html
@@ -0,0 +1,6 @@
+<div class="exercise-header">Exercise</div>
+{% autoescape false %}{{ section.content }}{% endautoescape %}
+<pre><code>{% autoescape false %}{{ section.code.base|code }}{% endautoescape %}</code></pre>
+<hr>
+<p>Solution:</p>
+<pre><code>{% autoescape false %}{{ section.code.solution|code }}{% endautoescape %}</code></pre>
diff --git a/theme/templates/page.html b/theme/templates/page.html
index 2f74fcfde..1bec16799 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -20,7 +20,7 @@
         {% if section.type == "normal" %}
             {% autoescape false %}{{ section.content }}{% endautoescape %}
         {% elif section.type == "exercise" %}
-            {% include "./includes/book/exercise.html" with {section: section} %}
+            {% include "./includes/page/exercise.html" with {section: section} %}
         {% elif section.type == "quiz" %}
             {% include "./includes/book/quiz.html" with {section: section} %}
         {% endif %}