diff --git a/theme/wttf/templates/article.html b/theme/wttf/templates/article.html
index ae46be5..307256e 100644
--- a/theme/wttf/templates/article.html
+++ b/theme/wttf/templates/article.html
@@ -29,4 +29,5 @@
 	</div>
 	<div class="entry-content e-content">{{ article.content }}</div>
 </section>
+
 {% endblock %}
diff --git a/theme/wttf/templates/index.html b/theme/wttf/templates/index.html
index 73202d2..780e4fd 100644
--- a/theme/wttf/templates/index.html
+++ b/theme/wttf/templates/index.html
@@ -3,7 +3,6 @@
 {% if articles %}
 	<section id="content">
 	{% for article in articles_page.object_list %}
-		{# First item #}
 		{% if loop.index <= 3 %}
 			<div class="featured">
 				<article>
@@ -29,6 +28,11 @@
 					<div class="entry-content e-content">{{ article.content }}</div>
 				</article>
 			</div>
+			{% if loop.index < 3 %}
+				{% if loop.last %}
+					</section>
+				{% endif %}
+			{% endif %}
 			{% if loop.index == 3 %}
 				</section>
 				<section id="list">
diff --git a/theme/wttf/templates/tag.html b/theme/wttf/templates/tag.html
index 65a99b5..c17cf1f 100644
--- a/theme/wttf/templates/tag.html
+++ b/theme/wttf/templates/tag.html
@@ -1,5 +1,2 @@
 {% extends "index.html" %}
-{% block content_title %}
-<h2>Articles in the {{ tag }} tag</h2>
-{% endblock %}