diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 98cd27f..022f577 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -2,7 +2,7 @@
 {{ partial "header" . }}
 <main>
     <h2>{{ .Title }}</h2>
-    {{ range (.Paginator 10).Pages }}
+    {{ range .Pages }}
         <div class="list-item">
 	    <div class="list-logo">
 	        <a href="{{ .Permalink }}">
@@ -17,4 +17,4 @@
 	</div>
     {{ end }}
 </main>
-{{ partial "footer" . }}
\ No newline at end of file
+{{ partial "footer" . }}
diff --git a/layouts/blog/list.html b/layouts/blog/list.html
new file mode 100644
index 0000000..546c530
--- /dev/null
+++ b/layouts/blog/list.html
@@ -0,0 +1,21 @@
+{{ partial "head_meta" . }}
+{{ partial "header" . }}
+<main>
+    <h2>Blog</h2>
+    {{ range .Pages }}
+        <div class="list-item">
+        <div class="list-logo">
+            <a href="{{ .Permalink }}">
+                <img src="{{ .Params.logo }}">
+            </a>
+        </div>
+        <div class="list-content">
+            <a href="{{ .Permalink }}">
+                <h4>{{ .Params.Project }} - {{ .Title }}</h4>
+            </a>
+            <h5>{{ .Description }}</h5>
+        </div>
+    </div>
+    {{ end }}
+</main>
+{{ partial "footer" . }}
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
new file mode 100644
index 0000000..21dda3b
--- /dev/null
+++ b/layouts/blog/single.html
@@ -0,0 +1,13 @@
+
+{{ partial "head_meta" . }}
+{{ partial "header" . }}
+<main>
+    <div class="item-header">
+        <h2>{{ .Params.Project }} - {{ .Title }}</h2>
+    </div>
+
+    <div class="item">
+        <div class="text-justify">{{ .Content }}</div>
+    </div>
+</main>
+{{ partial "footer" . }}
\ No newline at end of file
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 01d4b1b..eb9fa2e 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -5,7 +5,7 @@
             {{ if .Site.Home.AllTranslations}}
             <ul class="lang">
                 {{ range $.Site.Home.AllTranslations }}
-                <li><a href="{{ replace $.Params.url $.Page.Language.Lang .Language.Lang}}">{{ .Language.LanguageName }}</a></li>
+                <li><a href="{{ replace $.Page.RelPermalink $.Page.Language.Lang .Language.Lang}}">{{ .Language.LanguageName }}</a></li>
                 {{ end }}
             </ul>
             {{ end }}