diff --git a/archetypes/default.md b/archetypes/default.md
index edf3f0c..6563468 100644
--- a/archetypes/default.md
+++ b/archetypes/default.md
@@ -8,7 +8,7 @@ topics: []
 date:   {{ .Date }}
 author: 
 draft:  false
-weight: 10
+weight: 50
 ---
 
 ### First Headline
diff --git a/i18n/de.yaml b/i18n/de.yaml
index 6a508f9..96a88e5 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -5,6 +5,9 @@
 about:
   other: Über uns
 
+articles:
+  other: Artikel
+
 author:
   other: Autor
 
diff --git a/i18n/en.yaml b/i18n/en.yaml
index fe94c38..20acdfb 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -5,6 +5,9 @@
 about:
   other: About
 
+articles:
+  other: Articles
+
 author:
   other: Author
 
@@ -27,6 +30,12 @@ domain:
 next:
   other: Next
 
+pages:
+  other: Pages
+
+posts:
+  other: Posts
+
 prev:
   other: Previous
 
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d26b0ae..255450f 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -10,13 +10,13 @@
         <p class="post-meta">
           <time datetime='{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}' 
                 itemprop="datePublished">{{ .Date.Format (i18n "dateFormat") }}</time>
-          {{ with .Params.Author }} • 
+          {{ with .Params.Author -}} • 
             <span itemprop="author" itemscope 
                   itemtype="http://schema.org/Person">
               <span itemprop="name">{{ . }}</span></span>
           {{- end }}
         </p>
-        {{ end }}
+        {{- end }}
       </header>
 
       <div class="post-content card-body" itemprop="articleBody">
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 24ee8d6..6dc0604 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,43 +1,43 @@
 <div class="col-md-4 mt20">
 
-    {{ if .Params.img }}
+    {{ if .Params.img -}}
     <img width="100%" class="mt-3"
          src="{{ .Site.BaseURL}}img/{{ .Params.img }}" alt="{{ .Params.title }}">
-    {{ else if .Params.teaser }}
+    {{- else if .Params.teaser -}}
     <div class="card mt-3">
       <div class="card-body bg-light">
         <h5 class="card-text">{{ .Params.teaser }}</h5>
       </div>
     </div>
-    {{ else if .Site.Params.defaultImage }}
+    {{- else if .Site.Params.defaultImage -}}
     <img width="100%"  class="mt-3"
          src="{{ .Site.BaseURL }}img/{{ .Site.Params.defaultImage }}" alt="dummy">
-    {{ end }}
+    {{- end }}
 
-    {{ $site := .Site }}
-    {{ with .Params.Topics }}
+    {{- $site := .Site -}}
+    {{ with .Params.Topics -}}
     <div class="card mt-3">
       <div class="card-header">
         <h4 class="card-text">{{i18n "topics"}}</h4>
       </div>
       <div class="card-body">
         <ul id="topics" class="list-inline">
-          {{ range . }}
+          {{ range . -}}
           {{ $page := $site.GetPage (printf "/topics/%s" .) }}
           <li><a href="{{ $page.Permalink }}">{{ $page.Title }}</a> </li>
-          {{ end }}
+          {{- end }}
         </ul>
       </div>
     </div>
-    {{ end }}
+    {{- end }}
 
     <div class="card mt-3">
+      {{- $section := or .Section "posts" -}}
       <div class="card-header">
-        <h4 class="card-text">{{i18n "recentArticles"}}</h4>
+        <h4 class="card-text">{{i18n $section}}</h4>
       </div>
       <div class="card-body">
         <ul class="list-inline">
-          {{ $section := or .Section "posts" }}
           {{ range first 20 (where .Site.RegularPages "Section" $section) }}
             <li>
               <a href="{{ .Permalink }}"