diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index ded814ff..217bacf2 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -2,31 +2,32 @@
 {% block content_title %}{% endblock %}
 {% block content %}        
 {% if articles %}
-{% for article in articles_page.object_list %}        
-    {% if loop.first and not articles_page.has_previous() %}
-        <aside id="featured" class="body"><article>
-                <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url
-                }}">{{ article.title }}</a></h1> 
-                {% include 'article_infos.html' %}
-                {{ article.content }}
-                {% include 'comments.html' %}
+    {% for article in articles_page.object_list %}        
+
+        {# First item #}
+        {% if loop.first and not articles_page.has_previous() %}
+            <aside id="featured" class="body">
+                <article>
+                    <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1> 
+                    {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
                 </article>
                 {% if loop.length == 1 %}
                     {% include 'pagination.html' %}
                 {% endif %}
-                </aside><!-- /#featured -->
-        {% if loop.length > 1 %}
-            <section id="content" class="body">
-                <h1>Other articles</h1>
-                <hr />
-                    <ol id="posts-list" class="hfeed">
-        {% endif %}
-    {% else %} 
-    {% if loop.first and articles_page.has_previous %}
-    <section id="content" class="body">
-        <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
-    {% endif %}
-        <li><article class="hentry">    
+            </aside><!-- /#featured -->
+            {% if loop.length > 1 %}
+                <section id="content" class="body">
+                    <h1>Other articles</h1>
+                    <hr />
+                        <ol id="posts-list" class="hfeed">
+            {% endif %}
+        {# other items #}
+        {% else %} 
+            {% if loop.first and articles_page.has_previous %}
+                <section id="content" class="body">
+                    <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
+            {% endif %}
+            <li><article class="hentry">    
                 <header>
                         <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h1>
                 </header>
@@ -37,15 +38,16 @@
                 <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
                 {% include 'comments.html' %}
                 </div><!-- /.entry-content -->
-        </article></li>
-    {% endif %}
-    {% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %}
-        {% include 'pagination.html' %}
-    {% endif %}
+            </article></li>
+        {% endif %}
+        {% if loop.last and (articles_page.has_previous() 
+           or not articles_page.has_previous() and loop.length > 1) %}
+            {% include 'pagination.html' %}
+        {% endif %}
 {% endfor %}
-</ol><!-- /#posts-list -->
-{% if loop.length > 1 %}
-</section><!-- /#content -->
+    {% if loop.length > 1 or articles_page.has_previous() %}
+    </ol><!-- /#posts-list -->
+    </section><!-- /#content -->
 {% endif %}
 {% else %}
 <section id="content" class="body">