diff --git a/assets/scss/components/_footer.scss b/assets/scss/components/_footer.scss
index e109f7c..0095777 100644
--- a/assets/scss/components/_footer.scss
+++ b/assets/scss/components/_footer.scss
@@ -102,20 +102,6 @@
         }
     }
 
-    .copyright {
-        margin-left: auto;
-        display: flex;
-        align-items: center;
-        svg {
-            fill: var(--hera-text-light);
-            margin-left: 8px;
-            cursor: pointer;
-            &:hover {
-                fill: var(--hera-hover-color);
-            }
-        }
-    }
-
     nav {
         ul {
             display: flex;
diff --git a/assets/scss/components/_header.scss b/assets/scss/components/_header.scss
index dc78c16..8e17072 100644
--- a/assets/scss/components/_header.scss
+++ b/assets/scss/components/_header.scss
@@ -147,7 +147,7 @@
     margin-top: 10px;
     padding-bottom: 5px;
 
-    .widget--link {
+    .menu-item {
         padding: 3px 0;
         color: var(--hera-text-light);
 
diff --git a/assets/scss/templates/_map.scss b/assets/scss/templates/_map.scss
index 7401cb7..2783144 100644
--- a/assets/scss/templates/_map.scss
+++ b/assets/scss/templates/_map.scss
@@ -488,3 +488,61 @@
         flex-direction: column;
     }
 }
+
+.template--about {
+    padding-top: 20px;
+}
+
+.good--list {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-gap: 10px;
+    padding: 30px 0 20px;
+}
+
+.good--item {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: var(--hera-background-gray);
+    border-radius: 10px;
+    padding: 30px 0 0;
+    flex-direction: column;
+    // margin-bottom: 25px;
+    .img-spacer {
+        width: 50%;
+        position: relative;
+        transition: 0.5s;
+    }
+    &:hover {
+        //background: #eeeef0;
+        .img-spacer {
+            transform: translate3d(0, -5px, 0);
+        }
+        .good--actions,
+        .good--review {
+            display: flex;
+        }
+    }
+}
+
+.good--name {
+    font-size: 14px;
+    padding-bottom: 10px;
+    color: var(--hera-text-color);
+    margin-top: 10px;
+    line-height: 1.4;
+    width: 92%;
+    .brand {
+        color: var(--hera-text-gray-lightest);
+    }
+}
+
+@media (max-width: 600px) {
+    .good--list {
+        grid-template-columns: repeat(1, 1fr);
+        grid-gap: 15px;
+        padding: 10px 0 30px;
+    }
+}
diff --git a/assets/scss/templates/_term.scss b/assets/scss/templates/_term.scss
index c951ff1..ac63c69 100755
--- a/assets/scss/templates/_term.scss
+++ b/assets/scss/templates/_term.scss
@@ -259,3 +259,19 @@
     margin: 0 auto;
     width: 92%;
 }
+
+.archive--tagList {
+    display: flex;
+    flex-wrap: wrap;
+}
+.archive--tagItem {
+    margin: 10px;
+    background-color: var(--hera-background-gray);
+    padding: 3px 18px;
+    border-radius: 999rem;
+    font-size: 14px;
+    color: var(--hera-text-light);
+    &:hover {
+        color: var(--hera-hover-color);
+    }
+}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index b469b29..58b3fc1 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -1,14 +1,26 @@
 {{ define "main" }}
 
-<header class="tag--header post--list">
-    <h1 class="post-title">{{.Title}}</h1>
-    {{ if .Params.description }}
-    <div class="taxonomy--description">{{ .Params.description }}</div>
-    {{ end }}
-</header>
 <div class="post--list">
-    {{ range .Data.Pages }}
-    {{ partial "post.html" . }}
-    {{ end }}
+    <header class="term--header">
+        <div class="term--header__content">
+            <h1 class="post-title">{{.Title}}</h1>
+            {{ if .Params.description }}
+            <div class="taxonomy--description">{{ .Params.description }}</div>
+            {{ end }}
+        </div>
+    </header>
+    <div class="block--list">
+        {{ range .Data.Pages }}
+        {{ partial "post.html" . }}
+        {{ end }}
+    </div>
+    {{ $paginator := .Paginate (where .Pages "Type" "post") }}
+    <nav class="navigation ">
+        <div class="nav-links">
+            {{ range $paginator.Pagers }}
+            <a class="page-numbers{{ if eq . $paginator }} current{{ end }}" href="{{ .URL }}">{{ .PageNumber }}</a>
+            {{ end }}
+        </div>
+    </nav>
 </div>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index d4379e7..91620d6 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,8 +1,8 @@
 {{ define "main" }}
-<header class="tag--header post--list">
-    <h1 class="page--headline">{{.Title}}</h1>
-</header>
-<section class="post--list">
+<div class="articleContainer">
+    <header class="article--header">
+        <h2 class="article--headline">{{ .Title }}</h2>
+    </header>
     <div class="archive--tagList">
         {{ $data := .Data }}
         {{ range $key, $value := .Data.Terms.ByCount }}
@@ -13,5 +13,5 @@ <h1 class="page--headline">{{.Title}}</h1>
         </span>
         {{ end }}
     </div>
-</section>
+</div>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/category/list.html b/layouts/category/list.html
index 12972e6..fd12f5f 100644
--- a/layouts/category/list.html
+++ b/layouts/category/list.html
@@ -1,21 +1,27 @@
 {{ define "main" }}
-<header class="tag--header">
-    <h1 class="page--headline">{{.Title}}</h1>
-</header>
-<section class="layoutSingleColumn">
-    {{ $data := .Data }}
-    {{ range $key, $value := .Data.Terms.ByCount }}
-    <div class="category--item">
-        {{ if $value.Page.Params.cover }}
-        <img src="{{ $value.Page.Params.cover }}" class="category--cover">
+<div class="template--terms articleContainer">
+    <header class="article--header">
+        <h1 class="article--headline">{{.Title}}</h1>
+    </header>
+    <section class="collectionCard">
+        {{ $data := .Data }}
+        {{ range $key, $value := .Data.Terms.ByCount }}
+        <a href="{{ $value.Page.Permalink }}" class="collectionCard--item" data-count="{{ $value.Count }}">
+            {{ if $value.Page.Params.cover }}
+            <img src="{{ $value.Page.Params.cover }}" class="collectionCard--image">
+            {{ end }}
+            <div class="collectionCard--meta">
+                <div class="collectionCard--title">{{ $value.Page.Title }}</div>
+                <div class="collectionCard--description">{{ $value.Page.Params.description }}</div>
+                <svg xmlns="http://www.w3.org/2000/svg" width="41" height="40" viewBox="0 0 41 40" fill="none"
+                    class="collectionCard--icon">
+                    <path
+                        d="M20.75 1.25C23.2123 1.25 25.6505 1.73498 27.9253 2.67726C30.2002 3.61953 32.2672 5.00065 34.0083 6.74175C35.7494 8.48285 37.1305 10.5498 38.0727 12.8247C39.015 15.0995 39.5 17.5377 39.5 20C39.5 22.4623 39.015 24.9005 38.0727 27.1753C37.1305 29.4502 35.7494 31.5172 34.0083 33.2583C32.2672 34.9994 30.2002 36.3805 27.9253 37.3227C25.6505 38.265 23.2123 38.75 20.75 38.75C15.7772 38.75 11.0081 36.7746 7.49175 33.2583C3.97544 29.7419 2 24.9728 2 20C2 15.0272 3.97544 10.2581 7.49175 6.74175C11.0081 3.22544 15.7772 1.25 20.75 1.25ZM22.625 10H18.875V18.125H10.75V21.875H18.875V30H22.625V21.875H30.75V18.125H22.625V10Z"
+                        fill="#a47864"></path>
+                </svg>
+            </div>
+        </a>
         {{ end }}
-        <div class="category--content">
-            <a href="{{ $value.Page.Permalink }}">
-                {{ $value.Page.Title }}<span>({{ $value.Count }})</span>
-            </a>
-            <div class="category--desc">{{ $value.Page.Params.description }}</div>
-        </div>
-    </div>
-    {{ end }}
-</section>
+    </section>
+</div>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/category/term.html b/layouts/category/term.html
index b6d614d..307a3a2 100644
--- a/layouts/category/term.html
+++ b/layouts/category/term.html
@@ -13,6 +13,13 @@ <h1 class="term--title">{{.Title}}</h1>
         {{ partial "post.html" . }}
         {{ end }}
     </div>
-
+    {{ $paginator := .Paginate (where .Pages "Type" "post") }}
+    <nav class="navigation ">
+        <div class="nav-links">
+            {{ range $paginator.Pagers }}
+            <a class="page-numbers{{ if eq . $paginator }} current{{ end }}" href="{{ .URL }}">{{ .PageNumber }}</a>
+            {{ end }}
+        </div>
+    </nav>
 </div>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index 52394bf..7c57a89 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -11,25 +11,11 @@
         {{ end }} {{ end }}
     </div>
 </div>
-{{ if or ($paginator.HasPrev) ($paginator.HasNext) }}
-<div class="pagination">
-    {{ if $paginator.HasPrev }}
-    <span class="prev">
-        <a href="{{.Paginator.Prev.URL}}">
-            <span class="arrow">←</span> {{ with .Site.Params.newerPosts }}{{ . }}{{ else }}{{ i18n "postsNewer"
-            }}{{ end }}
-        </a>
-    </span>
-    {{ end }}
-
-    {{ if $paginator.HasNext }}
-    <span class="next">
-        <a href="{{.Paginator.Next.URL}}">
-            {{ with .Site.Params.olderPosts }}{{ . }}{{ else }}{{ i18n "postsOlder" }}{{ end }} <span
-                class="arrow">→</span>
-        </a>
-    </span>
-    {{ end }}
-</div>
-{{ end }}
+<nav class="navigation ">
+    <div class="nav-links">
+        {{ range $paginator.Pagers }}
+        <a class="page-numbers{{ if eq . $paginator }} current{{ end }}" href="{{ .URL }}">{{ .PageNumber }}</a>
+        {{ end }}
+    </div>
+</nav>
 {{ end }}
\ No newline at end of file
diff --git a/layouts/page/about.html b/layouts/page/about.html
index 8010a75..793c697 100644
--- a/layouts/page/about.html
+++ b/layouts/page/about.html
@@ -1,7 +1,9 @@
 {{ define "main" }}
 
-<div class="layoutSingleColumn u-paddingTop50">
-    <h2 class="page--headline">{{ .Title }}</h2>
+<div class="articleContainer">
+    <header class="article--header">
+        <h2 class="article--headline">{{ .Title }}</h2>
+    </header>
     {{ if .IsTranslated }}
     <div class="translatedCard">
         <h4>{{ i18n "translations" }}</h4>
@@ -15,7 +17,7 @@ <h4>{{ i18n "translations" }}</h4>
         </ul>
     </div>
     {{ end }}
-    <div class="graph u-marginBottom30">
+    <div class="grap article--body">
         {{ .Content }}
     </div>
 </div>
diff --git a/layouts/page/gears.html b/layouts/page/gears.html
index 85378fc..7727ca3 100644
--- a/layouts/page/gears.html
+++ b/layouts/page/gears.html
@@ -1,7 +1,9 @@
 {{ define "main" }}
 
-<div class="layoutSingleColumn u-paddingTop50">
-    <h2 class="page--headline">{{ .Title }}</h2>
+<div class="articleContainer">
+    <header class="article--header">
+        <h2 class="article--headline">{{ .Title }}</h2>
+    </header>
     <div class="good--list">
         {{ range .Params.faves }}
         <div class="good--item">
diff --git a/layouts/page/links.html b/layouts/page/links.html
index ed40c9f..8c8ecb7 100644
--- a/layouts/page/links.html
+++ b/layouts/page/links.html
@@ -1,20 +1,24 @@
 {{ define "main" }}
 
-<div class="layoutSingleColumn u-paddingTop50">
-    <h2 class="page--headline">{{ .Title }}</h2>
-    <div class="template--linksWrap">
-        <ul class="link-items">
-            {{ range .Params.links }}
-            <li class="link-item">
-                <a class="link-item-inner effect-apollo" href="{{ .link }}" title="Just a blog" target="_blank">
-                    <span class="sitename"><strong>{{ .title }}</strong>{{ .description }}</span>
-                </a>
-            </li>
-            {{ end }}
-        </ul>
-    </div>
-    <div class="graph u-marginBottom30">
-        {{ .Content }}
+<div class="articleContainer">
+    <div class="article" data-id="{{ .File.UniqueID}}">
+        <header class="article--header">
+            <h2 class="article--headline">{{ .Title }}</h2>
+        </header>
+        <div class="template--linksWrap">
+            <ul class="link-items">
+                {{ range .Params.links }}
+                <li class="link-item">
+                    <a class="link-item-inner effect-apollo" href="{{ .link }}" title="Just a blog" target="_blank">
+                        <span class="sitename"><strong>{{ .title }}</strong>{{ .description }}</span>
+                    </a>
+                </li>
+                {{ end }}
+            </ul>
+        </div>
+        <div class="grap u-marginBottom30">
+            {{ .Content }}
+        </div>
     </div>
 </div>
 
diff --git a/layouts/page/movies.html b/layouts/page/movies.html
index 8dc24dd..721b3fe 100644
--- a/layouts/page/movies.html
+++ b/layouts/page/movies.html
@@ -1,7 +1,9 @@
 {{ define "main" }}
 
-<div class="layoutSingleColumn u-paddingTop50">
-    <h2 class="page--headline">{{ .Title }}</h2>
+<div class="articleContainer">
+    <header class="article--header">
+        <h2 class="article--headline">{{ .Title }}</h2>
+    </header>
     <div class="db--container">
     </div>
 </div>
diff --git a/layouts/partials/navigation.html b/layouts/partials/navigation.html
index 452daee..96f0dcd 100644
--- a/layouts/partials/navigation.html
+++ b/layouts/partials/navigation.html
@@ -1,7 +1,7 @@
-<div class="widget--links ">
-	<div class="widget--link"><a href="/" title="My Work">My Work</a></div>
-	<div class="widget--link"><a href="/categories" title="My Work">Categories</a></div>
-	<div class="widget--link"><a href="/archive" title="My Work">Archive</a></div>
-	<div class="widget--link"><a href="/" title="My Work">Lens</a></div>
-	<div class="widget--link"><a href="/map" title="My Work">Travel Footprint</a></div>
-</div>
\ No newline at end of file
+<ul class="widget--links ">
+	{{ range $.Site.Menus.main }}
+	{{ if not .HasChildren }}
+	<li class="menu-item"><a href="{{ .URL }}">{{ .Name }}</a></li>
+	{{ end }}
+	{{ end }}
+</ul>
\ No newline at end of file