diff --git a/exampleSite/config/_default/menus.en.toml b/exampleSite/config/_default/menus.en.toml
index 2011412..ee3b18c 100755
--- a/exampleSite/config/_default/menus.en.toml
+++ b/exampleSite/config/_default/menus.en.toml
@@ -21,35 +21,30 @@ weight = 4
 name = "Pages"
 hasChildren = true
 
-  [[main]]
-  parent = "Pages"
-  name = "Blog"
-  url = "blog/"
+[[main]]
+parent = "Pages"
+name = "Blog"
+url = "blog/"
 
-  [[main]]
-  parent = "Pages"
-  name = "Contact"
-  url = "contact/"
+[[main]]
+parent = "Pages"
+name = "Contact"
+url = "contact/"
 
-  [[main]]
-  parent = "Pages"
-  name = "Authors"
-  url = "authors/"
+[[main]]
+parent = "Pages"
+name = "Authors"
+url = "authors/"
 
-  [[main]]
-  parent = "Pages"
-  name = "Search"
-  url = "search/"
+[[main]]
+parent = "Pages"
+name = "Categories"
+url = "categories/"
 
-  [[main]]
-  parent = "Pages"
-  name = "Categories"
-  url = "categories/"
-
-  [[main]]
-  parent = "Pages"
-  name = "404 Page"
-  url = "404/"
+[[main]]
+parent = "Pages"
+name = "404 Page"
+url = "404/"
 
 
 # footer menu
@@ -66,4 +61,4 @@ weight = 2
 [[footer]]
 name = "Privacy Policy"
 url = "privacy-policy/"
-weight = 3
\ No newline at end of file
+weight = 3
diff --git a/exampleSite/content/english/pages/about.md b/exampleSite/content/english/about/_index.md
similarity index 97%
rename from exampleSite/content/english/pages/about.md
rename to exampleSite/content/english/about/_index.md
index 416daea..293a3be 100644
--- a/exampleSite/content/english/pages/about.md
+++ b/exampleSite/content/english/about/_index.md
@@ -3,7 +3,6 @@ title: "Hey, I am John Doe!"
 meta_title: "About"
 description: "this is meta description"
 image: "/images/avatar.png"
-layout: "about"
 draft: false
 ---
 
diff --git a/exampleSite/content/english/authors/john-doe.md b/exampleSite/content/english/authors/john-doe.md
index 2b72bd5..1a385a6 100644
--- a/exampleSite/content/english/authors/john-doe.md
+++ b/exampleSite/content/english/authors/john-doe.md
@@ -4,9 +4,17 @@ email: johndoe@email.com
 image: "/images/avatar.png"
 description: this is meta description
 social:
-  facebook: https://www.facebook.com/
-  twitter: https://www.twitter.com/
-  instagram: https://www.instagram.com/
+- name: github
+  icon: fa-brands fa-github
+  link: https://github.com
+
+- name: twitter
+  icon: fa-brands fa-twitter
+  link: https://twitter.com
+
+- name: linkedin
+  icon: fa-brands fa-linkedin
+  link: https://linkedin.com
 ---
 
 lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostr navigation et dolore magna aliqua.
diff --git a/exampleSite/content/english/authors/sam-wilson.md b/exampleSite/content/english/authors/sam-wilson.md
index fd6abc8..198f319 100644
--- a/exampleSite/content/english/authors/sam-wilson.md
+++ b/exampleSite/content/english/authors/sam-wilson.md
@@ -4,9 +4,17 @@ email: samwilson@email.com
 image: "/images/avatar.png"
 description: this is meta description
 social:
-  facebook: https://www.facebook.com/
-  twitter: https://www.twitter.com/
-  instagram: https://www.instagram.com/
+- name: github
+  icon: fa-brands fa-github
+  link: https://github.com
+
+- name: twitter
+  icon: fa-brands fa-twitter
+  link: https://twitter.com
+
+- name: linkedin
+  icon: fa-brands fa-linkedin
+  link: https://linkedin.com
 ---
 
 lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostr navigation et dolore magna aliqua.
diff --git a/exampleSite/content/english/authors/william-jacob.md b/exampleSite/content/english/authors/william-jacob.md
index 4f7db81..a557bbc 100644
--- a/exampleSite/content/english/authors/william-jacob.md
+++ b/exampleSite/content/english/authors/william-jacob.md
@@ -4,9 +4,17 @@ email: williamjacob@email.com
 image: "/images/avatar.png"
 description: this is meta description
 social:
-  facebook: https://www.facebook.com/
-  twitter: https://www.twitter.com/
-  instagram: https://www.instagram.com/
+- name: github
+  icon: fa-brands fa-github
+  link: https://github.com
+
+- name: twitter
+  icon: fa-brands fa-twitter
+  link: https://twitter.com
+
+- name: linkedin
+  icon: fa-brands fa-linkedin
+  link: https://linkedin.com
 ---
 
 lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostr navigation et dolore magna aliqua.
diff --git a/exampleSite/content/english/pages/contact.md b/exampleSite/content/english/contact/_index.md
similarity index 83%
rename from exampleSite/content/english/pages/contact.md
rename to exampleSite/content/english/contact/_index.md
index a0e4fc0..bd6b9f6 100644
--- a/exampleSite/content/english/pages/contact.md
+++ b/exampleSite/content/english/contact/_index.md
@@ -2,6 +2,5 @@
 title: "Contact"
 meta_title: ""
 description: "this is meta description"
-layout: "contact"
 draft: false
 ---
diff --git a/exampleSite/content/english/_index.md b/exampleSite/content/english/homepage/_index.md
similarity index 100%
rename from exampleSite/content/english/_index.md
rename to exampleSite/content/english/homepage/_index.md
diff --git a/exampleSite/content/english/pages/elements.md b/exampleSite/content/english/pages/elements.md
index 8d62f01..a8a4081 100755
--- a/exampleSite/content/english/pages/elements.md
+++ b/exampleSite/content/english/pages/elements.md
@@ -1,5 +1,6 @@
 ---
 title: "Elements"
+# meta title
 meta_title: ""
 # meta description
 description: "This is meta description"
diff --git a/exampleSite/content/english/pages/privacy-policy.md b/exampleSite/content/english/pages/privacy-policy.md
index c11d54e..3d16c6e 100644
--- a/exampleSite/content/english/pages/privacy-policy.md
+++ b/exampleSite/content/english/pages/privacy-policy.md
@@ -1,7 +1,10 @@
 ---
 title: "Privacy"
+# meta title
 meta_title: ""
-description: "this is meta description"
+# meta description
+description: "This is meta description"
+# save as draft
 draft: false
 ---
 
diff --git a/exampleSite/content/english/pages/search.md b/exampleSite/content/english/pages/search.md
old mode 100644
new mode 100755
index 849320f..81d4a88
--- a/exampleSite/content/english/pages/search.md
+++ b/exampleSite/content/english/pages/search.md
@@ -1,7 +1,9 @@
 ---
-title: "Search"
-meta_title: ""
-description: "this is meta description"
+title: "Elements"
+# meta title
 layout: "search"
+# meta description
+description: "This is meta description"
+# save as draft
 draft: false
----
+---
\ No newline at end of file
diff --git a/layouts/_default/search.html b/layouts/_default/search.html
deleted file mode 100644
index dae937a..0000000
--- a/layouts/_default/search.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{{ define "main" }}
-  <div class="container">
-    <div class="row">
-      <div class="col-12">
-        {{ partial "search-page.html" (dict "Context" . "Class" "your-custom-class") }}
-      </div>
-    </div>
-  </div>
-{{ end }}
diff --git a/layouts/_default/about.html b/layouts/about/list.html
similarity index 100%
rename from layouts/_default/about.html
rename to layouts/about/list.html
diff --git a/layouts/authors/single.html b/layouts/authors/single.html
index 76b0e17..3d630f8 100755
--- a/layouts/authors/single.html
+++ b/layouts/authors/single.html
@@ -20,33 +20,14 @@
             {{ .Content }}
           </div>
           <ul class="social-icons ml-4 mt-10 text-center">
-            {{ if .Params.social.facebook }}
+            {{ range .Params.social }}
               <li>
                 <a
-                  href="{{ . | safeURL }}"
+                  href="{{ .link | safeURL }}"
                   target="_blank"
                   rel="noopener nofollow">
-                  <i class="fa-brands fa-facebook-f"></i>
-                </a>
-              </li>
-            {{ end }}
-            {{ if .Params.social.twitter }}
-              <li>
-                <a
-                  href="{{ . | safeURL }}"
-                  target="_blank"
-                  rel="noopener nofollow">
-                  <i class="fa-brands fa-twitter"></i>
-                </a>
-              </li>
-            {{ end }}
-            {{ if .Params.social.instagram }}
-              <li>
-                <a
-                  href="{{ . | safeURL }}"
-                  target="_blank"
-                  rel="noopener nofollow">
-                  <i class="fa-brands fa-instagram"></i>
+                  <span class="sr-only">{{ .title }}</span>
+                  <i class="{{ .icon }}"></i>
                 </a>
               </li>
             {{ end }}
diff --git a/layouts/_default/contact.html b/layouts/contact/list.html
similarity index 100%
rename from layouts/_default/contact.html
rename to layouts/contact/list.html
diff --git a/layouts/index.html b/layouts/index.html
index e355f08..c46a08b 100755
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,131 +1,134 @@
 {{ define "main" }}
-  <!-- Banner -->
-  {{ with .Params.banner }}
-    <section class="section pt-14">
-      <div class="container">
-        <div class="row justify-center">
-          <div class="lg:col-7 mb-8 text-center">
-            <h1 class="mb-4">
-              {{ .title | markdownify }}
-            </h1>
-            <p class="mb-8">
-              {{ .content | markdownify }}
-            </p>
-            {{ with .button }}
-              {{ if .enable }}
-                <a class="btn btn-primary" href="{{ .link | absURL }}">
-                  {{ .label }}
-                  <i class="fa fa-arrow-right"></i>
-                </a>
-              {{ end }}
-            {{ end }}
-          </div>
-          <div class="col-12">
-            {{ partial "image" (dict "Src" .image "Alt" "Banner image" "Loading" "eager" "Class" "mx-auto" "Size" "800x") }}
-          </div>
-        </div>
-      </div>
-    </section>
-  {{ end }}
-  <!-- /Banner -->
-
-  <!-- Features -->
-  {{ range $i, $e:= .Params.features }}
-    <section class="section-sm {{ if (modBool $i 2) }}bg-gradient{{ end }}">
-      <div class="container">
-        <div class="row items-center justify-between">
-          <div
-            class="mb:md-0 {{ if not (modBool $i 2) }}
-              md:order-2
-            {{ end }} md:col-5 mb-6">
-            {{ partial "image" (dict "Src" .image "Alt" "feature image") }}
-          </div>
-          <div
-            class="{{ if not (modBool $i 2) }}
-              md:order-1
-            {{ end }} md:col-7 lg:col-6">
-            <h2 class="mb-4">
-              {{ .title | markdownify }}
-            </h2>
-            <p class="mb-8 text-lg">
-              {{ .content | markdownify }}
-            </p>
-            <ul>
-              {{ range .bulletpoints }}
-                <li class="relative mb-4 pl-6">
-                  <i class="fa fa-check absolute left-0 top-1.5"></i>
-                  {{ . | markdownify }}
-                </li>
-              {{ end }}
-            </ul>
-          </div>
-        </div>
-      </div>
-    </section>
-  {{ end }}
-  <!-- /Features -->
-
-  <!-- Testimonials -->
-  {{ with site.GetPage "sections/testimonial" }}
-    {{ if .Params.enable }}
-      <section class="section">
+  {{ with site.GetPage "homepage" }}
+    <!-- Banner -->
+    {{ with .Params.banner }}
+      <section class="section pt-14">
         <div class="container">
-          <div class="row">
-            <div class="md:col-10 lg:col-8 xl:col-6 mx-auto mb-12 text-center">
-              <h2 class="mb-4">
-                {{ .Title | markdownify }}
-              </h2>
-              <p>
-                {{ .Params.description | markdownify }}
+          <div class="row justify-center">
+            <div class="lg:col-7 mb-8 text-center">
+              <h1 class="mb-4">
+                {{ .title | markdownify }}
+              </h1>
+              <p class="mb-8">
+                {{ .content | markdownify }}
               </p>
+              {{ with .button }}
+                {{ if .enable }}
+                  <a class="btn btn-primary" href="{{ .link | absURL }}">
+                    {{ .label }}
+                    <i class="fa fa-arrow-right"></i>
+                  </a>
+                {{ end }}
+              {{ end }}
             </div>
             <div class="col-12">
-              <div class="swiper testimonial-slider">
-                <div class="swiper-wrapper">
-                  {{ range .Params.testimonials }}
-                    <div class="swiper-slide">
-                      <div
-                        class="bg-theme-light dark:bg-darkmode-theme-light rounded-lg px-7 py-10">
-                        <div class="text-dark dark:text-white">
-                          <svg
-                            width="33"
-                            height="20"
-                            viewBox="0 0 33 20"
-                            fill="none"
-                            xmlns="http://www.w3.org/2000/svg">
-                            <path
-                              d="M1.28375 19.41L0.79375 18.64C1.21375 17.0067 1.75042 15.07 2.40375 12.83C3.05708 10.5433 3.75708 8.28 4.50375 6.04C5.29708 3.75333 6.06708 1.77 6.81375 0.0899959H15.3538C14.9338 2.09666 14.4904 4.26667 14.0238 6.6C13.5571 8.88666 13.1371 11.15 12.7638 13.39C12.4371 15.5833 12.1571 17.59 11.9238 19.41H1.28375ZM31.69 0.0899959L32.18 0.859998C31.76 2.54 31.2233 4.5 30.57 6.74C29.9167 8.98 29.2167 11.2433 28.47 13.53C27.7233 15.77 26.9533 17.73 26.16 19.41H17.69C18.0167 17.9167 18.3433 16.33 18.67 14.65C18.9967 12.9233 19.3 11.22 19.58 9.54C19.9067 7.81333 20.1867 6.15667 20.42 4.57C20.7 2.93666 20.91 1.44333 21.05 0.0899959H31.69Z"
-                              fill="currentColor" />
-                          </svg>
-                        </div>
-                        <blockquote class="mt-8">
-                          {{ .content | markdownify }}
-                        </blockquote>
-                        <div class="mt-11 flex items-center">
-                          <div class="text-dark dark:text-white">
-                            {{ partial "image" (dict "Src" .avatar "Size" "50x50" "Class" "rounded-full" "Alt" .name) }}
-                          </div>
-                          <div class="ml-4">
-                            <h3 class="h5 font-primary font-semibold">
-                              {{ .name }}
-                            </h3>
-                            <p class="text-dark dark:text-white">
-                              {{ .designation | markdownify }}
-                            </p>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  {{ end }}
-                </div>
-                <div
-                  class="testimonial-slider-pagination mt-9 flex items-center justify-center text-center"></div>
-              </div>
+              {{ partial "image" (dict "Src" .image "Alt" "Banner image" "Loading" "eager" "Class" "mx-auto" "Size" "800x") }}
             </div>
           </div>
         </div>
       </section>
     {{ end }}
+    <!-- /Banner -->
+
+    <!-- Features -->
+    {{ range $i, $e:= .Params.features }}
+      <section class="section-sm {{ if (modBool $i 2) }}bg-gradient{{ end }}">
+        <div class="container">
+          <div class="row items-center justify-between">
+            <div
+              class="mb:md-0 {{ if not (modBool $i 2) }}
+                md:order-2
+              {{ end }} md:col-5 mb-6">
+              {{ partial "image" (dict "Src" .image "Alt" "feature image") }}
+            </div>
+            <div
+              class="{{ if not (modBool $i 2) }}
+                md:order-1
+              {{ end }} md:col-7 lg:col-6">
+              <h2 class="mb-4">
+                {{ .title | markdownify }}
+              </h2>
+              <p class="mb-8 text-lg">
+                {{ .content | markdownify }}
+              </p>
+              <ul>
+                {{ range .bulletpoints }}
+                  <li class="relative mb-4 pl-6">
+                    <i class="fa fa-check absolute left-0 top-1.5"></i>
+                    {{ . | markdownify }}
+                  </li>
+                {{ end }}
+              </ul>
+            </div>
+          </div>
+        </div>
+      </section>
+    {{ end }}
+    <!-- /Features -->
+
+    <!-- Testimonials -->
+    {{ with site.GetPage "sections/testimonial" }}
+      {{ if .Params.enable }}
+        <section class="section">
+          <div class="container">
+            <div class="row">
+              <div
+                class="md:col-10 lg:col-8 xl:col-6 mx-auto mb-12 text-center">
+                <h2 class="mb-4">
+                  {{ .Title | markdownify }}
+                </h2>
+                <p>
+                  {{ .Params.description | markdownify }}
+                </p>
+              </div>
+              <div class="col-12">
+                <div class="swiper testimonial-slider">
+                  <div class="swiper-wrapper">
+                    {{ range .Params.testimonials }}
+                      <div class="swiper-slide">
+                        <div
+                          class="bg-theme-light dark:bg-darkmode-theme-light rounded-lg px-7 py-10">
+                          <div class="text-dark dark:text-white">
+                            <svg
+                              width="33"
+                              height="20"
+                              viewBox="0 0 33 20"
+                              fill="none"
+                              xmlns="http://www.w3.org/2000/svg">
+                              <path
+                                d="M1.28375 19.41L0.79375 18.64C1.21375 17.0067 1.75042 15.07 2.40375 12.83C3.05708 10.5433 3.75708 8.28 4.50375 6.04C5.29708 3.75333 6.06708 1.77 6.81375 0.0899959H15.3538C14.9338 2.09666 14.4904 4.26667 14.0238 6.6C13.5571 8.88666 13.1371 11.15 12.7638 13.39C12.4371 15.5833 12.1571 17.59 11.9238 19.41H1.28375ZM31.69 0.0899959L32.18 0.859998C31.76 2.54 31.2233 4.5 30.57 6.74C29.9167 8.98 29.2167 11.2433 28.47 13.53C27.7233 15.77 26.9533 17.73 26.16 19.41H17.69C18.0167 17.9167 18.3433 16.33 18.67 14.65C18.9967 12.9233 19.3 11.22 19.58 9.54C19.9067 7.81333 20.1867 6.15667 20.42 4.57C20.7 2.93666 20.91 1.44333 21.05 0.0899959H31.69Z"
+                                fill="currentColor" />
+                            </svg>
+                          </div>
+                          <blockquote class="mt-8">
+                            {{ .content | markdownify }}
+                          </blockquote>
+                          <div class="mt-11 flex items-center">
+                            <div class="text-dark dark:text-white">
+                              {{ partial "image" (dict "Src" .avatar "Size" "50x50" "Class" "rounded-full" "Alt" .name) }}
+                            </div>
+                            <div class="ml-4">
+                              <h3 class="h5 font-primary font-semibold">
+                                {{ .name }}
+                              </h3>
+                              <p class="text-dark dark:text-white">
+                                {{ .designation | markdownify }}
+                              </p>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    {{ end }}
+                  </div>
+                  <div
+                    class="testimonial-slider-pagination mt-9 flex items-center justify-center text-center"></div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </section>
+      {{ end }}
+    {{ end }}
+    <!-- /Testimonials -->
   {{ end }}
-  <!-- /Testimonials -->
 {{ end }}
diff --git a/layouts/partials/components/author-card.html b/layouts/partials/components/author-card.html
index e9e536a..23988af 100755
--- a/layouts/partials/components/author-card.html
+++ b/layouts/partials/components/author-card.html
@@ -18,24 +18,11 @@
     {{ .Summary }}
   </p>
   <ul class="social-icons">
-    {{ if .Params.social.facebook }}
+    {{ range .Params.social }}
       <li>
-        <a href="{{ . | safeURL }}" target="_blank" rel="noopener nofollow">
-          <i class="fa-brands fa-facebook-f"></i>
-        </a>
-      </li>
-    {{ end }}
-    {{ if .Params.social.twitter }}
-      <li>
-        <a href="{{ . | safeURL }}" target="_blank" rel="noopener nofollow">
-          <i class="fa-brands fa-twitter"></i>
-        </a>
-      </li>
-    {{ end }}
-    {{ if .Params.social.instagram }}
-      <li>
-        <a href="{{ . | safeURL }}" target="_blank" rel="noopener nofollow">
-          <i class="fa-brands fa-instagram"></i>
+        <a href="{{ .link | safeURL }}" target="_blank" rel="noopener nofollow">
+          <span class="sr-only">{{ .title }}</span>
+          <i class="{{ .icon }}"></i>
         </a>
       </li>
     {{ end }}
diff --git a/package.json b/package.json
index 0825086..e263c90 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hugoplate",
   "description": "hugo tailwindcss boilerplate",
-  "version": "1.6.3",
+  "version": "1.7.0",
   "license": "MIT",
   "author": "zeon.studio",
   "scripts": {