diff --git a/pkg/random/random.go b/pkg/random/random.go
index aead9330..00efd726 100644
--- a/pkg/random/random.go
+++ b/pkg/random/random.go
@@ -71,8 +71,16 @@ func MotDebileQuiSeMange() string {
 
 func MotCool() string {
 	mots := []string{
-		"cool", "sympa", "gentil", "genial", "excellent", "superbe", "super",
-		"vraiment tres bien", "bien", "qui en a dans le pantalon", "top",
+		"cool", "sympa", "gentil", "génial", "excellent", "superbe", "super",
+		"vraiment très bien", "bien", "qui en a dans le pantalon", "top",
+	}
+	return mots[rand.Intn(len(mots))]
+}
+
+func MotCoolPluriel() string {
+	mots := []string{
+		"cools", "sympas", "gentils", "géniaux", "excellents", "superbes", "supers",
+		"vraiment très biens", "biens", "qui en ont dans le pantalon", "tops",
 	}
 	return mots[rand.Intn(len(mots))]
 }
diff --git a/pkg/soundcloud/entities.go b/pkg/soundcloud/entities.go
index d43fea7d..98ccf3e4 100644
--- a/pkg/soundcloud/entities.go
+++ b/pkg/soundcloud/entities.go
@@ -1,6 +1,9 @@
 package soundcloud
 
-import "fmt"
+import (
+	"fmt"
+	"strings"
+)
 
 func (p *Playlist) IsMain() bool {
 	switch p.PlaylistType {
@@ -47,3 +50,7 @@ func (t *Track) URL() string {
 func (t *Track) IsExternal() bool { return false }
 
 func (t *Track) ImageURL() string { return t.ArtworkUrl }
+
+func (t *Track) Tags() []string {
+	return strings.Split(t.TagList, " ") // FIXME: use shell lexer
+}
diff --git a/templates/hackz.tmpl b/templates/hackz.tmpl
index 5fbd345d..4825069e 100644
--- a/templates/hackz.tmpl
+++ b/templates/hackz.tmpl
@@ -1,9 +1,6 @@
 {{define "title"}}Hackz{{end}}
-
-{{/*
-{% block title %}Des hackz{% endblock %}
-{% block subtitle %}à l'unité{% endblock %}
-*/}}
+{{define "h1"}}Des hackz{{end}}
+{{define "h1small"}}à l'unité{{end}}
 
 {{define "content"}}
 {{ $columns := 3 }}
@@ -14,7 +11,7 @@
   <div class="row">
     {{ range $entry := .hackz.Entries }}
 
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 rotate-random">
+    <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 rotate-random">
       <a href="{{ $entry.URL}}" class="thumbnail"
          width="{{$square_size}}" height="{{$square_size}}"
          {{ if $entry.IsExternal }} target="_blank"{{ end }}>
@@ -30,14 +27,19 @@
     </div>
 
     {{ end }}
-
   </div>
-  <p class="well">Et plein d'autres..</p>
+
+  <!--<p class="well">Et plein d'autres..</p>-->
+{{end}}
+
+
+{{define "secondary_column"}}
+  <h3>Hackzers les plus {{ mot_cool_pluriel }} <small>(pour l'instant !)</small></h3>
+  Les scores sont cassés et reviendront bientôt
 {{end}}
 
 {{/*
 {% block secondary_column %}
-  <h2>Hackzers les plus {{ mot_cool() }} <small>(pour l'instant !)</small></h2>
   <ul>
     {% for scor in hackzers %}
     <li>#{{ loop.index }} {{ scor.login }} avec {{ scor.score }} {{ mot_debile_qui_se_mange() }}</li>
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 9804ab6d..84e507ac 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -1,9 +1,6 @@
 {{define "fulltitle"}}Camembert au lait crew{{end}}
-
-{{/*
-{{ block title }}{{ images | length }} trucs{{ endblock }}
-{{ block subtitle }}au hasard{{ endblock }}
-*/}}
+{{define "h1"}}{{len .dashboard.Entries}} trucs {{mot_cool_pluriel}}{{end}}
+{{define "h1small"}}au hasard{{end}}
 
 
 {{define "content"}}
diff --git a/templates/layout/base.tmpl b/templates/layout/base.tmpl
index c478fc53..16965d78 100644
--- a/templates/layout/base.tmpl
+++ b/templates/layout/base.tmpl
@@ -111,26 +111,25 @@
 
         <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9 col-md-push-3 col-lg-push-3">
           <div class="row">
-            {{ block "content" . }}{{end}}
-            {{/*
-                                             {{ if layout == 'two_columns' }}
-            <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
-              <h1>{{ self.title() }} <small>{{ self.subtitle() }}</small></h1>
-              {{ block main_column }}{{ endblock }}
-            </div>
-            <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
-              <hr class="hidden-md hidden-lg" />
-              {{ block secondary_column }}{{ endblock }}
-            </div>
-            {{ else }} {# one column #}
-            <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
-              <h1>{{ self.title() }} <small>{{ self.subtitle() }}</small></h1>
-              {{template "content" .}}
-            </div>
+
+            {{if eq .layout_mode "single_column"}}
+              <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+                <h1>{{ block "h1" . }}{{end}} <small>{{ block "h1small" . }}{{end}}</small></h1>
+                {{ block "content" . }}{{end}}
+              </div>
+            {{end}}
+            {{if eq .layout_mode "two_columns"}}
+              <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+                <h1>{{ block "h1" . }}{{end}} <small>{{ block "h1small" . }}{{end}}</small></h1>
+                {{ block "content" . }}{{end}}
+              </div>
+              <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+                <hr class="hidden-md hidden-lg" />
+                {{ block "secondary_column" . }}{{ end }}
+              </div>
             {{end}}
-*/}}
 
-                                </div>
+          </div>
         </div>
 
         <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3 col-md-pull-9 col-lg-pull-9">
diff --git a/templates/muzik.tmpl b/templates/muzik.tmpl
index 42a583c1..7b0b4569 100644
--- a/templates/muzik.tmpl
+++ b/templates/muzik.tmpl
@@ -1,9 +1,7 @@
 {{define "title"}}Muzik{{end}}
+{{define "h1"}}Des albums {{mot_cool_pluriel}}{{end}}
+{{define "h1small"}}pas au hasard{{end}}
 
-{{/*
-{% block title %}Des albums{% endblock %}
-{% block subtitle %}pas au hasard{% endblock %}
-*/}}
 
 {{define "content"}}
 {{ $columns := 2 }}
diff --git a/templates/track.tmpl b/templates/track.tmpl
index 9b243bc1..26acd1b4 100644
--- a/templates/track.tmpl
+++ b/templates/track.tmpl
@@ -2,8 +2,8 @@
 {{define "h1"}}Du son {{ mot_cool }}{{end}}
 {{define "h1small"}}{{.track.Title}}{{end}}
 
-{{define "content"}}
 
+{{define "content"}}
   <!--<pre>{{.track|toPrettyJson}}</pre>-->
 
   <iframe
@@ -19,27 +19,22 @@
   {{end}}
 {{end}}
 
-{{/*
-{% block main_column %}
-{% endblock %}
 
-{% block secondary_column %}
-      <a href="{{ track.ext_url }}" target="_blank">
-        <img src="{{ track.img | cache_external_assets }}" alt="{{ track.title }}"
-             class="img-responsive img-rounded rotate-random" />
-      </a>
+{{define "secondary_column"}}
+    <a href="{{ .track.PermalinkUrl }}" target="_blank">
+      <img src="{{ .track.ImageURL | cache_external_asset }}" alt="{{ .track.Title }}"
+           class="img-responsive img-rounded rotate-random" />
+    </a>
 
-      <div class="track_date">
-        {{ track.created_at }}
-      </div>
+    <div class="track_date">
+      {{ .track.CreatedAt }}
+    </div>
 
-      {# FIXME: handle tags etc in html headers for SEO #}
+    <!-- FIXME: handle tags etc in html headers for SEO -->
 
-      <div class="track_tags">
-        {% for tag in track.tags %}
-        <span class="label label-primary">#{{ tag }}</span>
-        {% endfor %}
-      </div>
-
-{% endblock %}
-*/}}
+    <div class="track_tags">
+      {{ range $tag := .track.Tags }}
+        <span class="label label-primary">#{{ $tag }}</span>
+      {{ end }}
+    </div>
+{{end}}
diff --git a/views/funcmap.go b/views/funcmap.go
index 30614ce0..4bd9558c 100644
--- a/views/funcmap.go
+++ b/views/funcmap.go
@@ -39,6 +39,7 @@ func getFuncmap(opts *Options) *ctxFuncmap {
 	fm["logo_alternate"] = random.AlternateLogo
 	fm["mot_du_jour"] = random.WOTD
 	fm["mot_cool"] = random.MotCool
+	fm["mot_cool_pluriel"] = random.MotCoolPluriel
 	fm["megahertz"] = f.megahertz
 	fm["mot_debile_qui_se_mange"] = random.MotDebileQuiSeMange
 	fm["neige"] = func() bool { return false }
diff --git a/views/util.go b/views/util.go
index 7235fc80..4b5a0d51 100644
--- a/views/util.go
+++ b/views/util.go
@@ -82,6 +82,9 @@ func (h *handlers) render(w http.ResponseWriter, r *http.Request, name string, d
 		"name": name,
 		"r":    r,
 	}
+	if _, found := data["layout_mode"]; !found {
+		data["layout_mode"] = "single_column"
+	}
 
 	// set current request in ctxFuncmap objects
 	h.templatesMutex.Lock()
diff --git a/views/views.go b/views/views.go
index 8fc47600..99f6447d 100644
--- a/views/views.go
+++ b/views/views.go
@@ -125,7 +125,10 @@ func (h *handlers) trackHandler(w http.ResponseWriter, r *http.Request) {
 		h.renderError(w, r, err)
 		return
 	}
-	data := renderData{"track": track}
+	data := renderData{
+		"track":       track,
+		"layout_mode": "two_columns",
+	}
 	h.render(w, r, "track.tmpl", data)
 }
 
@@ -160,6 +163,9 @@ func (h *handlers) hackzHandler(w http.ResponseWriter, r *http.Request) {
 		h.renderError(w, r, err)
 		return
 	}
-	data := renderData{"hackz": hackz}
+	data := renderData{
+		"hackz":       hackz,
+		"layout_mode": "two_columns",
+	}
 	h.render(w, r, "hackz.tmpl", data)
 }