diff --git a/templates/link-page.html b/templates/link-page.html
index 402906f..4130bc1 100644
--- a/templates/link-page.html
+++ b/templates/link-page.html
@@ -6,7 +6,8 @@
 
 {%- block content %}
         <h1 id="post-title"><a href="{{ page.extra.url }}">{{ page.title }}</a></h1>
-        <time class="link-date"><strong>Linked {{ page.date }}</strong></time>
+        <time class="link-date"><strong>{% if lang == "pt" %}Linkado{% else %}Linked{% endif %} {{ page.date }}</strong></time>
+
         {%- if page.extra.comment %}<p>{{ page.extra.comment }}</p>{% endif %}
         {{- page.content | safe }}
 {%- endblock content %}
diff --git a/templates/links.html b/templates/links.html
index 5eb021e..aa52dd1 100644
--- a/templates/links.html
+++ b/templates/links.html
@@ -10,19 +10,19 @@
         <ul id="posts">
           {%- for page in english_section.pages %}
           <li>
-            {%- if page.content %}<a class="post-date" href="{{ page.permalink }}">{{ page.date }}</a>
-              {%- else %}
+          {%- if page.content -%}
+          {%- set portuguese_page = get_page(path="links/" ~ page.slug ~ ".pt.md") %}
+            <time class="post-date"><a href="
+            {%- if lang == "pt" -%}
+              {{ portuguese_page.permalink -}}
+            {%- else -%}
+              {{ page.permalink -}}
+            {%- endif -%}
+            ">{{ page.date -}}</a></time>
+          {%- else %}
             <time class="post-date">{{ page.date }}</time>
-            {%- endif %}
+          {%- endif -%}
             <a href="{{ page.extra.url | safe }}">{{ page.title }}</a>
-            {%- if page.content %}
-              {%- set portuguese_page = get_page(path="links/" ~ page.slug ~ ".pt.md") %}
-              {%- if lang == "pt" %}
-              <span>{{ portuguese_page.content | replace(from="<p>", to="") | safe }}</span>
-              {%- else %}
-              <span>{{ page.content | replace(from="<p>", to="") | safe }}</span>
-              {%- endif %}
-            {%- endif %}
           </li>
           {%- endfor %}
         </ul>