diff --git a/_layouts/post.html b/_layouts/post.html
index 1fa73c6242213863176ad6079c49a79b20ae3a4c..60c7c3a0bf841cef02a5f214136dbc70ed197412 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -3,29 +3,33 @@ layout: default
 ---
 
 <article>
+  <header>
     <h4><a href="/" alt='Inicio'>En Defensa del Software Libre</a></h4>
     <nav id="formats">
       <ul>
 {% for format in site.pandoc.outputs %}
-        <li><a href="{{ format }}/{{ page.url | replace:'html',format }}">{{ format }}</a></li>
+        {% capture extension %}{{ format | first }}{% endcapture %}
+        <li><a href="{{ extension }}{{ page.url | remove:'.html' }}.{{ extension }}">{{ extension }}</a></li>
 {% endfor %}
       </ul>
     </nav>
 
     <h2>{{ page.author }}</h2>
+    <h1>{{ page.title }}</h1>
+  </header>
 
     {{ content }}
 
-    <footer id="related">
+  <footer id="related">
 
-        <h2>Otras lecturas</h2>
-        <ul class="posts">
+      <h2>Otras lecturas</h2>
+      <ul class="posts">
 
 {% for post in site.related_posts limit:3 %}
-              <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+            <li><a href="{{ post.url }}">{{ post.title }}</a></li>
 {% endfor %}
 
-        </ul>
-    </footer>
+      </ul>
+  </footer>
 
 </article>
diff --git a/atom.xml b/atom.xml
index 05a6fef94c0d934595df49e827fcd0b49642ea97..0a72cebc81c00058d3c3907bd9e8ee33490ab264 100644
--- a/atom.xml
+++ b/atom.xml
@@ -23,8 +23,9 @@ layout: nil
    <id>http://endefensadelsl.org{{ post.id }}</id>
    <content type="html">{{ post.content | xml_escape }}</content>
    {% for format in site.pandoc.outputs %}
+   {% capture extension %}{{ format | first }}{% endcapture %}
    <link rel="enclosure" title="{{ post.title }}" 
-         href="http://endefensadelsl.org/{{ format }}/{{ post.url | replace:'html',format }}"/>
+         href="http://endefensadelsl.org/{{ extension }}/{{ post.url | remove:'.html' }}.{{ extension }}"/>
    {% endfor %}
  </entry>
  {% endfor %}
diff --git a/index.markdown b/index.markdown
index e65675627235146c8f5c4d8c4b19d7de101bf4ad..6e105022673e6086ab64850e88b4fa5dcaaa375b 100644
--- a/index.markdown
+++ b/index.markdown
@@ -15,7 +15,8 @@ title: En Defensa del Software Libre
 [{{ post.title }}]({{ post.url }})
 :   {{post.author}}
     {% for format in site.pandoc.outputs limit:2 %}
-:   [{{ format }}]({{ format }}/{{ post.url | replace:'html',format }})
+    {% capture extension %}{{ format | first }}{% endcapture %}
+:   [{{ extension }}]({{ extension }}{{ post.url | remove:'.html' }}.{{ extension }})
     {% endfor %}
 :   [otros...]({{ post.url }}#formats)