diff --git a/themes/hugo-bulma-cookbook/layouts/_default/list.html b/themes/hugo-bulma-cookbook/layouts/_default/list.html
index e40a75f..d9563d0 100644
--- a/themes/hugo-bulma-cookbook/layouts/_default/list.html
+++ b/themes/hugo-bulma-cookbook/layouts/_default/list.html
@@ -1,59 +1,12 @@
 {{ partial "header.html" . }}
 {{ partial "hero.html" . }}
 
-<div class="container">
-    <br>
-    
-    {{ range .RegularPages }}
+{{ if $.Site.Params.UseListRows }}
+{{ partial "list.rows.html" . }}
+{{ end }}
 
-        <div class="card">
-            <div class="card-content">
-                <div class="media">
-
-                    
-                    <div class="media-left">
-                        <figure class="image is-128x128">
-                            <a href="{{ .Permalink }}" >
-                            {{ with .Params.listthumbnail }}
-                                <img src="{{ . }}" alt="Placeholder image" >
-                            {{ end }}
-                            </a>
-                        </figure>
-                    </div>
-                    
-
-                    <div class="media-content">
-                        <p class="title is-4">
-                            <a href="{{ .Permalink }}"> {{ .Title }}</a>
-                        </p>
-                        <p class="subtitle is-6">{{ .Params.subtitle }}</p>
-                        
-                        {{ with .Params.tags }}
-                        <div class="buttons">
-                            {{ range . }}
-                            <button class="button">
-                                <a href="{{ "tags" | absURL }}/{{ . | urlize }}">{{ . }}</a>
-                            </button>
-                            {{ end }}
-                        </div>
-                        {{ end }}
-
-
-                        {{ with .Params.categories }}
-                        <div class="buttons">
-                            {{ range . }}
-                            <button class="button">
-                                <a href="{{ "categories" | absURL }}/{{ . | urlize }}">{{ . }}</a>
-                            </button>
-                            {{ end }}
-                        </div>
-                        {{ end }}
-                    </div>
-                </div>
-            </div>
-        </div>
-    {{ end }}
-    
-</div>
+{{ if $.Site.Params.UseCardView }}
+{{ partial "list.cards.html" . }}
+{{ end }}
 
 {{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/themes/hugo-bulma-cookbook/layouts/_default/single.html b/themes/hugo-bulma-cookbook/layouts/_default/single.html
index fa77727..779e07f 100644
--- a/themes/hugo-bulma-cookbook/layouts/_default/single.html
+++ b/themes/hugo-bulma-cookbook/layouts/_default/single.html
@@ -6,11 +6,9 @@
     
     <div class="columns">
 
-        {{ if .Params.thumbnail }}
         <div class="column">
-            <img src="{{ .Params.thumbnail }}" />
+            <img src="{{ .Site.BaseURL }}{{.File.Dir}}thumbnail.png" alt="Missing thumbnail :(" />
         </div>
-        {{ end }}
     
         <div class="column">
             <div class="content">
diff --git a/themes/hugo-bulma-cookbook/layouts/partials/header.html b/themes/hugo-bulma-cookbook/layouts/partials/header.html
index 605a2a3..c98d51f 100644
--- a/themes/hugo-bulma-cookbook/layouts/partials/header.html
+++ b/themes/hugo-bulma-cookbook/layouts/partials/header.html
@@ -6,9 +6,9 @@
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
     <link rel="stylesheet" type="text/css" href="https://unpkg.com/bulma-prefers-dark" />
 
-    <link rel="icon" href="favicon.svg">
-    <link rel="mask-icon" href="favicon.svg" color="#000000">
-    <link rel="apple-touch-icon" href="apple-touch-icon.svg">
+    <link rel="icon" href="{{ .Site.BaseURL }}favicon.svg">
+    <link rel="mask-icon" href="{{ .Site.BaseURL }}favicon.svg" color="#000000">
+    <link rel="apple-touch-icon" href="{{ .Site.BaseURL }}apple-touch-icon.svg">
 
     <script>
         document.addEventListener('DOMContentLoaded', () => {
diff --git a/themes/hugo-bulma-cookbook/layouts/partials/hero.html b/themes/hugo-bulma-cookbook/layouts/partials/hero.html
index b2596bd..53dbc31 100644
--- a/themes/hugo-bulma-cookbook/layouts/partials/hero.html
+++ b/themes/hugo-bulma-cookbook/layouts/partials/hero.html
@@ -1,6 +1,14 @@
 <section class="hero is-primary">
-    <div class="hero-body">
-      <h1 class="title">{{ .Title }}</h1>
-      <p class="subtitle">{{ .Params.subtitle }}</p>
+
+  <div class="hero-body">
+    <div class="container has-text-centered">
+      <p class="title">
+        {{ .Title }}
+      </p>
+      <p class="subtitle">
+        {{ .Params.subtitle}}
+      </p>
     </div>
+  </div>
+
 </section>
\ No newline at end of file
diff --git a/themes/hugo-bulma-cookbook/layouts/partials/list.card.html b/themes/hugo-bulma-cookbook/layouts/partials/list.card.html
new file mode 100644
index 0000000..4b9d954
--- /dev/null
+++ b/themes/hugo-bulma-cookbook/layouts/partials/list.card.html
@@ -0,0 +1,22 @@
+<div class="card">
+    <div class="card-image">
+        <figure class="image is-4x3">
+            <img src="{{ .Site.BaseURL }}{{ .File.Dir }}thumbnail.png" alt="">
+        </figure>
+    </div>
+    <div class="card-content">
+        <div class="media">
+
+            <div class="media-content">
+                <p class="title is-4">{{ .Title }}</p>
+                <p class="subtitle is-6">@johnsmith</p>
+            </div>
+        </div>
+
+        <div class="content">
+            <a href="#">#css</a> <a href="#">#responsive</a>
+            <br>
+            <time datetime="2016-1-1">11:09 PM - 1 Jan 2016</time>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/themes/hugo-bulma-cookbook/layouts/partials/list.cards.html b/themes/hugo-bulma-cookbook/layouts/partials/list.cards.html
new file mode 100644
index 0000000..4187d0c
--- /dev/null
+++ b/themes/hugo-bulma-cookbook/layouts/partials/list.cards.html
@@ -0,0 +1,30 @@
+<div class="container">
+    <br>
+
+    <div class="columns is-desktop">
+
+        <div class="column">
+
+            {{ range first 3 .RegularPages }}
+                {{ partial "list.card.html" . }}
+            <br>
+            {{ end }}
+        </div>
+
+        <div class="column">
+            {{ range first 3 (after 3 .RegularPages ) }}
+                {{ partial "list.card.html" . }}
+            <br>
+            {{ end }}
+        </div>
+
+        <div class="column">
+            {{ range first 3 (after 6 .RegularPages ) }}
+                {{ partial "list.card.html" . }}
+            <br>
+            {{ end }}
+        </div>
+    </div>
+
+
+</div>
\ No newline at end of file
diff --git a/themes/hugo-bulma-cookbook/layouts/partials/list.rows.html b/themes/hugo-bulma-cookbook/layouts/partials/list.rows.html
new file mode 100644
index 0000000..c45aa74
--- /dev/null
+++ b/themes/hugo-bulma-cookbook/layouts/partials/list.rows.html
@@ -0,0 +1,49 @@
+<div class="container mt-8">
+    
+    {{ range .RegularPages }}
+
+        <div class="card">
+            <div class="card-content">
+                <div class="media">
+
+                    <div class="media-left">
+                        <figure class="image is-128x128">
+                            <a href="{{ .Permalink }}" >
+                                <img src="{{ .Site.BaseURL }}{{ .File.Dir }}thumbnail.png" alt="" >
+                            </a>
+                        </figure>
+                    </div>
+                    
+                    <div class="media-content">
+                        <p class="title is-4">
+                            <a href="{{ .Permalink }}"> {{ .Title }}</a>
+                        </p>
+                        <p class="subtitle is-6">{{ .Params.subtitle }}</p>
+                        
+                        {{ with .Params.tags }}
+                        <div class="buttons">
+                            {{ range . }}
+                            <button class="button">
+                                <a href="{{ "tags" | absURL }}/{{ . | urlize }}">{{ . }}</a>
+                            </button>
+                            {{ end }}
+                        </div>
+                        {{ end }}
+
+
+                        {{ with .Params.categories }}
+                        <div class="buttons">
+                            {{ range . }}
+                            <button class="button">
+                                <a href="{{ "categories" | absURL }}/{{ . | urlize }}">{{ . }}</a>
+                            </button>
+                            {{ end }}
+                        </div>
+                        {{ end }}
+                    </div>
+                </div>
+            </div>
+        </div>
+    {{ end }}
+    
+</div>
\ No newline at end of file