diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 3cc4324..cfb6ea5 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -11,15 +11,9 @@
     {{ if .Params.showMetadata | default true }}
     <section class="postMetadata">
         <dl>
-            {{ with .GetTerms "tags" }}
-                {{ partial "taxonomy/tags.html" . }}
-            {{ end }}
             {{ with .GetTerms "authors" }}
                 {{ partial "taxonomy/authors.html" . }}
             {{ end }}
-            {{ with .GetTerms "categories" }}
-                {{ partial "taxonomy/categories.html" . }}
-            {{ end }}
             {{ if .Site.Params.published | default true }}
                 <dt>{{ i18n "published" }}</dt>
                 {{ $formattedDate := .Date.Format "2006-01-02" }}
@@ -29,16 +23,14 @@
                 <dt>{{ i18n "reading_time" }}</dt>
                 <dd>{{ i18n "reading_time_desc" .ReadingTime }}</dd>
             {{ end }}
+            {{ with .GetTerms "categories" }}
+                {{ partial "taxonomy/categories.html" . }}
+            {{ end }}
+            {{ with .GetTerms "tags" }}
+                {{ partial "taxonomy/tags.html" . }}
+            {{ end }}
         </dl>
-{{ $pages := .CurrentSection.Pages.ByWeight }}
-
-{{ with $pages.Prev . }}
-<a href="{{ .RelPermalink }}">« Entrada anterior</a>
-{{ end }}
-/
-{{ with $pages.Next . }}
-  <a href="{{ .RelPermalink }}">Entrada siguiente »</a>
-{{ end }}
+   {{ template "partials/prev-next.html" . }}
     </section>
     {{ end }}
     <div>
@@ -66,9 +58,11 @@
     {{ end }}
   </ul>
 {{ end }}
+    </section>
 </br>
     </div>
 </div>
 </br>
     </div>
+
 {{ end }}
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 0ffa94e..a6c0147 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -25,7 +25,7 @@
             <!-- [html-validate-disable-next prefer-native-element] -->
             <div class="postListItem" role="listitem">
                 <div class="postHeader">
-                    <span class="postTitle">{{ .Title }}</span>
+                    <span class="postTitle">{{ .Title }}</span></a>
                     {{ $formattedDate := .Date.Format "2006-01-02" }}
                     <time class="postDate" datetime="{{ $formattedDate }}">{{ .Date | time.Format ":date_long" }}</time>
                 </div>
@@ -33,7 +33,7 @@
                     <p>{{ .Summary }}</p>
                 </div>
             </div>
-        </a>
+        
 {{ range .Pages.ByWeight }}
   <h2><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h2>
 {{ end }}
diff --git a/layouts/partials/prev-next.html b/layouts/partials/prev-next.html
new file mode 100644
index 0000000..1345742
--- /dev/null
+++ b/layouts/partials/prev-next.html
@@ -0,0 +1,13 @@
+{{ $pages := .CurrentSection.Pages.ByDate.Reverse }}
+
+{{ with $pages.Prev . }}
+  <a href="{{ .RelPermalink }}">« Entrada anterior</a>
+{{ else }}
+  {{ print "« Entrada anterior" }}
+{{ end }}
+<span>|</span>
+{{ with $pages.Next . }}
+  <a href="{{ .RelPermalink }}">Entrada siguiente »</a>
+{{ else }}
+  {{ print "Entrada siguiente »" }}
+{{ end }}
diff --git a/layouts/partials/taxonomy/categories.html b/layouts/partials/taxonomy/categories.html
new file mode 100644
index 0000000..1716e84
--- /dev/null
+++ b/layouts/partials/taxonomy/categories.html
@@ -0,0 +1,8 @@
+<!-- [html-validate-disable element-required-ancestor] -->
+<dt>{{ i18n "categories" }}</dt>
+<dd>
+{{- range $index, $el := . -}}
+    <span> /</span>
+    <a href="{{ .RelPermalink }}">{{- .LinkTitle -}}</a> 
+{{- end -}}
+</dd>