diff --git a/README.md b/README.md
index b6256ad..6af0c29 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,11 @@ theme = "pixyll"
   twitter_username = "username"
   disqus_shortname = "sitename"
   paginate = true
+
+[[menu.main]]
+  url = "/about"
+  name = "About"
+  weight = 0
 ```
 
 ## Search
diff --git a/i18n/en.toml b/i18n/en.toml
index 0ed1828..0b8625a 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -1,9 +1,3 @@
-[about]
-other = "About"
-
-[contact]
-other = "Contact"
-
 [tags]
 other = "Tags"
 
@@ -18,3 +12,10 @@ other = "Newer"
 
 [older]
 other = "Older"
+
+[by]
+other = "by"
+
+[post_date_format]
+other = "Jan 2, 2006"
+
diff --git a/i18n/ru.toml b/i18n/ru.toml
index c8d2b78..1dd963a 100644
--- a/i18n/ru.toml
+++ b/i18n/ru.toml
@@ -1,9 +1,3 @@
-[about]
-other = "О нас"
-
-[contact]
-other = "Контакты"
-
 [tags]
 other = "Теги"
 
@@ -18,3 +12,9 @@ other = "Следующая"
 
 [older]
 other = "Предыдущая"
+
+[by]
+other = "автор: "
+
+[post_date_format]
+other = "02.01.2006"
diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html
index 8ba1dc0..9caa646 100644
--- a/layouts/partials/navigation.html
+++ b/layouts/partials/navigation.html
@@ -1,6 +1,11 @@
-<a href="{{ .Site.BaseURL }}{{ .Site.LanguagePrefix }}/about/">{{ i18n "about" }}</a>
+{{ $currentPage := . }}
+{{ range .Site.Menus.main }}
+    <a class="nav-item{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} active{{end}}" href="{{.URL}}">{{ .Name }}</a>
+{{ end }}
+
+{{ if .Site.Taxonomies.tags }}
 <a href="{{ .Site.BaseURL }}{{ .Site.LanguagePrefix }}/tags/">{{ i18n "tags" }}</a>
-<a href="{{ .Site.BaseURL }}{{ .Site.LanguagePrefix }}/contact/">{{ i18n "contact" }}</a>
+{{ end }}
 {{- if .Site.IsMultiLingual -}}
 {{- range $lang := .Site.Languages -}}
 {{- if ne $.Site.Language $lang -}}
diff --git a/layouts/post/single.html b/layouts/post/single.html
index 3e6c8a1..71fc7de 100644
--- a/layouts/post/single.html
+++ b/layouts/post/single.html
@@ -5,7 +5,7 @@
     <div class="measure">
       <div class="post-header mb2">
         <h1 class="py2">{{ .Title }}</h1>
-        <span class="post-meta">{{ .Date.Format "Jan 2, 2006" }} by {{ .Params.author }}</span><br>
+        <span class="post-meta">{{ .Date.Format (i18n "post_date_format") }}{{ with .Params.author }} {{ i18n "by" }} {{ . }}{{end}}</span><br>
         {{ $baseurl := .Site.BaseURL }}
       </div>
 
@@ -13,12 +13,14 @@ <h1 class="py2">{{ .Title }}</h1>
       {{ .Content }}
       </article>
 
-      <p class="post-meta">{{ i18n "tags" }}:&nbsp;
-        {{ range $i, $e := .Params.tags }}
-            {{if $i}},&nbsp;{{end}}
-            <a href="{{ $baseurl }}{{ $.Site.LanguagePrefix }}/tags/{{ . }}">{{ . }}</a>
-        {{ end }}
-      </p>
+      {{ with .Params.tags }}
+          <p class="post-meta">{{ i18n "tags" }}:&nbsp;
+            {{ range $i, $e := . }}
+                {{if $i}},&nbsp;{{end}}
+                <a href="{{ $baseurl }}{{ $.Site.LanguagePrefix }}/tags/{{ . }}">{{ . }}</a>
+            {{ end }}
+          </p>
+      {{ end }}
 
       {{ partial "comments.html" . }}
     </div>
diff --git a/layouts/post/summary.html b/layouts/post/summary.html
index 03b3504..e4dd07a 100644
--- a/layouts/post/summary.html
+++ b/layouts/post/summary.html
@@ -1,15 +1,17 @@
 <div class="post">
   <a class="post-link" href="{{ .Permalink }}">
-  <p class="post-meta left">{{ .Date.Format "Jan 2, 2006" }}</p>
-  <p class="post-author right">{{ i18n "written" }} {{ .Params.author }}</p>
+  <p class="post-meta left">{{ .Date.Format (i18n "post_date_format") }}</p>
+  <p class="post-author right">{{ with .Params.author }}{{ i18n "written" }} {{ . }}{{end}}</p>
   <div class="clearfix"></div>
   <h3 class="h2 post-title">{{ .Title }} {{ if .Draft }}(draft){{end}}</h3>
   <p class="post-summary">{{ .Summary }}</p>
   </a>
   {{ $baseurl := .Site.BaseURL }}
-  <p class="post-meta">{{ i18n "tags" }}:&nbsp;
-  {{ range $i, $e := .Params.tags }}
-      {{if $i}},&nbsp;{{end}}
-      <a href="{{ $baseurl }}{{ $.Site.LanguagePrefix }}/tags/{{ . }}">{{ . }}</a>
-  {{ end }}</p>
+  {{ with .Params.tags }}
+      <p class="post-meta">{{ i18n "tags" }}:&nbsp;
+      {{ range $i, $e := . }}
+          {{if $i}},&nbsp;{{end}}
+          <a href="{{ $baseurl }}{{ $.Site.LanguagePrefix }}/tags/{{ . }}">{{ . }}</a>
+      {{ end }}</p>
+  {{ end }}
 </div>