diff --git a/.coafile b/.coafile
index 0707b389..edfbf0ec 100644
--- a/.coafile
+++ b/.coafile
@@ -67,3 +67,8 @@ keywords = coala
 bears = PyPluralNamingBear
 files = **.py
 ignore_list = LOGGING, MIDDLEWARE
+
+[all.jinja]
+files = templates/**.html
+bears = Jinja2Bear
+check_end_labels = False
diff --git a/templates/contributors.html b/templates/contributors.html
index bc86a70b..1e079ab0 100644
--- a/templates/contributors.html
+++ b/templates/contributors.html
@@ -34,7 +34,7 @@ <h1>Details of all the contributors</h1>
                 <p>teams:
                 {% for team in contributor.teams.all %}
                     {{ team.name }}
-                {% endfor %}
+                {% endfor %}{# for team in contributor.teams.all #}
                 </p>
               </div>
             </div>
diff --git a/templates/gamification.html b/templates/gamification.html
index 86ae3005..48becb65 100644
--- a/templates/gamification.html
+++ b/templates/gamification.html
@@ -32,11 +32,11 @@ <h1>The gamification leaderboard</h1>
                   <p>{{ forloop.counter }}. {{ activity.name }}, performed_at:
                     {{ activity.performed_at }} updated_at: {{ activity.updated_at }}
                   </p>
-                {% endfor %}
+                  {% endfor %}{# for activity in participant.activities.all #}
                 <p>Badges Earned:
                 {% for badge in participant.badges.all %}
                   <p>{{ forloop.counter }}.{{ badge.name }}</p>
-                {% endfor %}
+                  {% endfor %}{# for badge in participant.badges.all #}
                 </p>
               </div>
             </div>
@@ -44,7 +44,7 @@ <h1>The gamification leaderboard</h1>
         </div>
       </div>
       <hr>
-      {% endfor %}{# for contributor in contributors #}
+      {% endfor %}{# for participant in participants #}
     </ul>
   </body>
 </html>
diff --git a/templates/index.html b/templates/index.html
index ac8b5703..80530eeb 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -24,6 +24,6 @@
     </ul>
     {% if isTravis %}
     <small>This website was built automatically using Travis CI. A link to the build can be found <a href="{{ travisLink }}">here</a>.</small>
-    {% endif %}
+    {% endif %}{# if isTravis #}
   </body>
 </html>
diff --git a/templates/openhub.html b/templates/openhub.html
index 0f187211..cfdb3a02 100644
--- a/templates/openhub.html
+++ b/templates/openhub.html
@@ -10,9 +10,9 @@
   </head>
   <body>
     <h1>All of our Portfolio Projects</h1>
-    {%  for error in errors %}
+    {% for error in errors %}
     <p>{{ error | safe }}</p>
-    {%  endfor  %}
+    {% endfor %}{# for error in errors #}
 
     {% for project in projects %}
     <div class="container">
@@ -38,6 +38,5 @@ <h1>All of our Portfolio Projects</h1>
       </div>
     </div>
     <hr>
-    {% endfor %}{# for project in projects #}
-  </body>
+    {% endfor %}{# for project in projects #} {# for project in projects #}  </body>
 </html>
