diff --git a/content/posts/search.md b/content/posts/search.md
index 0f038c1..4586d1f 100644
--- a/content/posts/search.md
+++ b/content/posts/search.md
@@ -1,5 +1,7 @@
 ---
 title: "Search Results"
+date: 2010-06-08T08:06:25+06:00
+weight: 999999
 sitemap:
   priority : 0.1
 layout: "search"
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index ac93f3c..dd0f21b 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -8,9 +8,9 @@
 {{ end }}
 
 {{ define "sidebar" }}
-  {{ $blogHome:="#" }}
+  {{ $homePage:="#" }}
   {{ if site.IsMultiLingual }}
-    {{ $blogHome = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }}
+    {{ $homePage = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }}
   {{ end }}
 
   <section class="sidebar-section" id="sidebar-section">
@@ -38,7 +38,11 @@
     <div class="container-fluid post-card-holder" id="post-card-holder">
       {{ $paginator := .Paginate .RegularPagesRecursive 12 }}
       {{ range $paginator.Pages }}
-        {{ partial "cards/post.html" . }}
+        {{ if .Layout }}
+          {{/* ignore the search.md file*/}}
+        {{ else }}
+          {{ partial "cards/post.html" . }}
+        {{ end }}
       {{ end }}
     </div>
     <div class="paginator">
diff --git a/layouts/_default/search.html b/layouts/_default/search.html
index 056bfae..a0f55e4 100644
--- a/layouts/_default/search.html
+++ b/layouts/_default/search.html
@@ -8,9 +8,9 @@
 {{ end }}
 
 {{ define "sidebar" }}
-  {{ $blogHome:="#" }}
+  {{ $homePage:="#" }}
   {{ if site.IsMultiLingual }}
-    {{ $blogHome = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }}
+    {{ $homePage = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }}
   {{ end }}
 
   <section class="sidebar-section" id="sidebar-section">
diff --git a/layouts/notes/list.html b/layouts/notes/list.html
index 3a6c373..df4b845 100644
--- a/layouts/notes/list.html
+++ b/layouts/notes/list.html
@@ -12,9 +12,9 @@
 {{ end }}
 
 {{ define "sidebar" }}
-  {{ $blogHome:="#" }}
+  {{ $homePage:="#" }}
   {{ if site.IsMultiLingual }}
-    {{ $blogHome = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }}
+    {{ $homePage = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }}
   {{ end }}
 
   <section class="sidebar-section" id="sidebar-section">
@@ -40,12 +40,10 @@
 <section class="content-section" id="content-section">
   <div class="content container-fluid" id="content">
     <div class="container-fluid note-card-holder" id="note-card-holder">
-        {{ range .RegularPagesRecursive  }}
-          {{ if .Layout }}
-          {{ else }}
-            {{ .Content }}
-          {{ end }}
-        {{ end }}
+        {{ partial "note-aggregator.html" . }}
+    </div>
+    <div class="paginator">
+      {{ template "_internal/pagination.html" . }}
     </div>
   </div>
 </section>
diff --git a/layouts/notes/single.html b/layouts/notes/single.html
index 3a6c373..9f0d0bf 100644
--- a/layouts/notes/single.html
+++ b/layouts/notes/single.html
@@ -12,9 +12,9 @@
 {{ end }}
 
 {{ define "sidebar" }}
-  {{ $blogHome:="#" }}
+  {{ $homePage:="#" }}
   {{ if site.IsMultiLingual }}
-    {{ $blogHome = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }}
+    {{ $homePage = (path.Join (cond ( eq .Language.Lang "en") "" .Language.Lang) .Type) }}
   {{ end }}
 
   <section class="sidebar-section" id="sidebar-section">
@@ -40,12 +40,9 @@
 <section class="content-section" id="content-section">
   <div class="content container-fluid" id="content">
     <div class="container-fluid note-card-holder" id="note-card-holder">
-        {{ range .RegularPagesRecursive  }}
-          {{ if .Layout }}
-          {{ else }}
-            {{ .Content }}
-          {{ end }}
-        {{ end }}
+      <div class="note-collection">
+        {{ .Content }}
+      </div>
     </div>
   </div>
 </section>
diff --git a/layouts/partials/note-aggregator.html b/layouts/partials/note-aggregator.html
new file mode 100644
index 0000000..f00996e
--- /dev/null
+++ b/layouts/partials/note-aggregator.html
@@ -0,0 +1,18 @@
+{{ $paginator := .Paginate .RegularPagesRecursive 10 }}
+{{ range $paginator.Pages }}
+    {{ if .Layout }}
+        {{/* ignore search.md file*/}}
+    {{ else }}
+        {{$id := .Params.Menu.Notes.Identifier }}
+        <h4 class="note-collection-title" id="{{ $id }}">
+            <a href="#{{ $id }}"># {{ .Title }}</a>
+            {{$badges:= split .File.Dir "/"}}
+            {{ range after 1 $badges }}
+            <span class="badge btn-info note-badge">{{ . }}</span>
+            {{ end }}
+        </h4>
+        <div class="note-collection">
+            {{ .Content }}
+        </div>
+    {{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/sections/recent-posts.html b/layouts/partials/sections/recent-posts.html
index 46387d2..937bdff 100644
--- a/layouts/partials/sections/recent-posts.html
+++ b/layouts/partials/sections/recent-posts.html
@@ -9,7 +9,7 @@
   {{ end }}
   <div class="container">
     <div class="row" id="recent-post-cards">
-      {{ range first 3 (where site.RegularPages.ByDate.Reverse "Type" "in" site.Params.mainSections )}}
+      {{ range first 3 (where site.RegularPages.ByDate.Reverse "Type" "in" "posts" )}}
         {{ partial "cards/recent-post.html" . }}
       {{ end }}
     </div>
diff --git a/layouts/shortcodes/note.html b/layouts/shortcodes/note.html
index bfc8809..1438d89 100644
--- a/layouts/shortcodes/note.html
+++ b/layouts/shortcodes/note.html
@@ -1,5 +1,7 @@
-<div class="card note-card">
-    <div class="card-header">{{.Get "title"}}</div>
+<div class="card note-card {{if .Get "size" }}{{.Get "size"}}-note{{end}}">
+    <div class="card-header" style="background-color: {{ site.Params.notes.headerBackground | default "transparent" }};">
+        <span class="note-title" style="color: {{ site.Params.notes.headerTextColor | default "#1c2d41" }};">{{.Get "title"}}</span>
+    </div>
     <div class="card-body">{{ .Inner | markdownify }}</div>
     {{ if .Get "footer" }}
     <div class="card-footer">{{ .Get "footer" }}</div>
diff --git a/static/css/layouts/main.css b/static/css/layouts/main.css
index 70fe743..5a219de 100644
--- a/static/css/layouts/main.css
+++ b/static/css/layouts/main.css
@@ -178,6 +178,24 @@ pre > code {
 }
 
 
+/* ======= Paginator ========= */
+.paginator {
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  margin: auto;
+  vertical-align: bottom;
+}
+
+.paginator .page-item > a {
+  color: #248aaa;
+}
+
+.paginator .page-item.active > a {
+  background-color: #248aaa;
+  color: #f9fafc;
+}
+
 /* --- FOOTER START --- */
 
 .footer {
diff --git a/static/css/layouts/note.css b/static/css/layouts/note.css
index c6a59e6..7cb2c76 100644
--- a/static/css/layouts/note.css
+++ b/static/css/layouts/note.css
@@ -22,13 +22,47 @@
   min-height: 130vh;
 }
 
-.note-card-holder {
+.note-card-holder{
+  padding-top: 2rem;
+}
+
+.note-collection {
   display: flex;
   flex-wrap: wrap;
-  padding-top: 2rem;
 }
 
 .note-card {
   margin: 1rem;
   align-self: flex-start;
 }
+
+.note-title{
+  font-weight: 800;
+}
+
+.note-card .card-body{
+  padding: 1rem;
+}
+
+.note-card pre {
+  margin: 0;
+  border-radius: 3px;
+}
+
+.small-note{
+  max-width: 15rem;
+}
+
+.medium-note{
+  max-width: 25rem;
+}
+
+.large-note{
+  max-width: 40rem;
+}
+
+.huge-note{}
+
+.note-badge{
+  font-size: 10pt;
+}