diff --git a/_includes/author-note-widget.html b/_includes/author-note-widget.html
new file mode 100644
index 000000000..2bce4b799
--- /dev/null
+++ b/_includes/author-note-widget.html
@@ -0,0 +1,6 @@
+{% include language-detection.html %}
+{% assign author_note_title = site.languages[current_lang].text.author_note_title %}
+<div class="mt10 recent">
+    <h3>{{author_note_title}}</h3>
+    <p><a href='{{ page.author_note_link }}'>{{ page.author_note_text }}</a></p>
+</div>
\ No newline at end of file
diff --git a/_includes/book-widget.html b/_includes/book-widget.html
new file mode 100644
index 000000000..493c9dced
--- /dev/null
+++ b/_includes/book-widget.html
@@ -0,0 +1,13 @@
+{% include language-detection.html %}
+{% assign knw_btn = site.languages[current_lang].text.know_more_button %}
+{% assign buy = site.languages[current_lang].text.buy_button %}
+
+<!--sidebar book announcement-->
+<div class="mt10 recent">
+  <a href="{{site.banner_books[current_lang].book.page}}"><img src="{{ site.banner_books[current_lang].book.cover }}" alt="Book '{{ site.books[current_lang].book.title }}' Cover being displayed on an ipad"/></a>
+  <h3><a href="{{site.banner_books[current_lang].book.page}}" style="text-decoration: none;">{{ site.banner_books[current_lang].book.title }}</a></h3>
+  <p>{{ site.banner_books[current_lang].book.short_description }}</p>
+  <a href="{{site.banner_books[current_lang].book.gumroad}}"><button class="buy">{{buy}} Gumroad</button></a>
+  <a href="{{site.banner_books[current_lang].book.amazon}}"><button class="buy">{{buy}} Amazon</button></a>
+  <br><a href="{{site.banner_books[current_lang].book.page}}"><button class="buy">{{knw_btn}}</button></a>
+</div>
\ No newline at end of file
diff --git a/_includes/related-articles-widget.html b/_includes/related-articles-widget.html
new file mode 100644
index 000000000..2a2e7889a
--- /dev/null
+++ b/_includes/related-articles-widget.html
@@ -0,0 +1,32 @@
+{% include language-detection.html %}
+{% assign recent_articles_title = site.languages[current_lang].text.recent_articles_title %}
+{% assign related_articles_title = site.languages[current_lang].text.related_articles_title %}
+{% if page.related %}
+<div class="mt10 recent">
+    <h2>{{related_articles_title}}</h2>
+    {% assign related_post_list = page.posts_list | join: ',' | split: ','  %}
+    {% for related_post in related_post_list %}
+        {% assign related_post_url = related_post | prepend: "/" | append: "/" %}
+        {% for post in site.posts %}
+        {% if post.url == related_post_url %}
+        <ul>
+            <li>
+            <p><a href="{{ post.url | prepend: site.url }}">{{ post.title }}</a><small>&nbsp;&nbsp;{{ post.date | date_to_string }}</small></p>
+            </li>
+        </ul>
+        {% endif %}
+        {% endfor %}
+    {% endfor %}
+</div>
+{% else %}
+<div class="mt10 recent">
+    <h2>{{recent_articles_title}}</h2>
+    <ul>
+    {% for post in site.posts limit:3 %}
+        <li>
+        <p><a href="{{ post.url | prepend: site.url }}">{{ post.title }}</a><small>&nbsp;&nbsp;{{ post.date | date_to_string }}</small></p>
+        </li>
+    {% endfor %}
+    </ul>
+</div>
+{% endif %}
\ No newline at end of file
diff --git a/_includes/series-widget.html b/_includes/series-widget.html
new file mode 100644
index 000000000..345b9ef97
--- /dev/null
+++ b/_includes/series-widget.html
@@ -0,0 +1,22 @@
+{% include language-detection.html %}
+{% assign series_posts = site.posts | where: "series", page.series | sort: "series_order" %}
+{% if series_posts.size > 1 %}
+    <div class="mt10 recent">
+    {% if current_lang == "en" %}
+        <h4>📚 Series: {{ page.series }}</h4>
+    {% else %}
+        <h4>📚 Série: {{ page.series }}</h4>
+    {% endif %}
+    <ol>
+        {% for post in series_posts %}
+        <li>
+            {% if post.url == page.url %}
+            <p><strong>{{ post.title }}</strong></p>
+            {% else %}
+            <p><a href="{{ post.url | prepend: site.url }}">{{ post.title }}</a></p>
+            {% endif %}
+        </li>
+        {% endfor %}
+    </ol>
+    </div>
+{% endif %}
\ No newline at end of file
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index dffb79140..a69d76d07 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -1,68 +1,26 @@
-{% include language-detection.html %}
-{% assign knw_btn = site.languages[current_lang].text.know_more_button %}
-{% assign buy = site.languages[current_lang].text.buy_button %}
-{% assign recent_articles_title = site.languages[current_lang].text.recent_articles_title %}
-{% assign related_articles_title = site.languages[current_lang].text.related_articles_title %}
-{% assign author_note_title = site.languages[current_lang].text.author_note_title %}
 <div class="col-md-4 mt20">
-        <div class="post-img">
-          {% if page.image %}
-            {% if page.image contains "http" %}
-              <img width="100%" style="border-radius: 3%;" src="{{page.image}}" alt="{{page.title}}">
-            {% else %}
-              <img width="100%" style="border-radius: 3%;" src="{{site.baseurl}}{{site.url}}{{page.image}}" alt="{{page.title}}">
-            {% endif %}
-          {% else %}
-            <img width="100%" style="border-radius: 3%;" src="{{site.baseurl}}{{site.url}}{{site.default-image}}" alt="{{page.title}}">
-          {% endif %}
-        </div>
+  <div class="post-img">
+    {% if page.image %}
+      {% if page.image contains "http" %}
+        <img width="100%" style="border-radius: 3%;" src="{{page.image}}" alt="{{page.title}}">
+      {% else %}
+        <img width="100%" style="border-radius: 3%;" src="{{site.baseurl}}{{site.url}}{{page.image}}" alt="{{page.title}}">
+      {% endif %}
+    {% else %}
+      <img width="100%" style="border-radius: 3%;" src="{{site.baseurl}}{{site.url}}{{site.default-image}}" alt="{{page.title}}">
+    {% endif %}
+  </div>
 
-        {% if page.author_note == true %}
-        <div class="mt10 recent">
-          <h3>{{author_note_title}}</h3>
-          <p><a href='{{ page.author_note_link }}'>{{ page.author_note_text }}</a></p>
-        </div>
-        {% endif %}
+  {% if page.author_note == true %}
+    {% include author-note-widget.html %}
+  {% endif %}
 
-        <!--sidebar book announcement-->
-        <div class="mt10 recent">
-          <a href="{{site.banner_books[current_lang].book.page}}"><img src="{{ site.banner_books[current_lang].book.cover }}" alt="Book '{{ site.books[current_lang].book.title }}' Cover being displayed on an ipad"/></a>
-          <h3><a href="{{site.banner_books[current_lang].book.page}}" style="text-decoration: none;">{{ site.banner_books[current_lang].book.title }}</a></h3>
-          <p>{{ site.banner_books[current_lang].book.short_description }}</p>
-          <a href="{{site.banner_books[current_lang].book.gumroad}}"><button class="buy">{{buy}} Gumroad</button></a>
-          <a href="{{site.banner_books[current_lang].book.amazon}}"><button class="buy">{{buy}} Amazon</button></a>
-          <br><a href="{{site.banner_books[current_lang].book.page}}"><button class="buy">{{knw_btn}}</button></a>
-        </div>
-        {% if page.layout == "post" %}
-          {% if page.related %}
-            <div class="mt10 recent">
-                <h2>{{related_articles_title}}</h2>
-                {% assign related_post_list = page.posts_list | join: ',' | split: ','  %}
-                {% for related_post in related_post_list %}
-                  {% assign related_post_url = related_post | prepend: "/" | append: "/" %}
-                  {% for post in site.posts %}
-                    {% if post.url == related_post_url %}
-                    <ul>
-                      <li>
-                        <p><a href="{{ post.url | prepend: site.url }}">{{ post.title }}</a><small>&nbsp;&nbsp;{{ post.date | date_to_string }}</small></p>
-                      </li>
-                    </ul>
-                    {% endif %}
-                  {% endfor %}
-                {% endfor %}
-            </div>
-          {% else %}
-            <div class="mt10 recent">
-              <h2>{{recent_articles_title}}</h2>
-              <ul>
-                {% for post in site.related_posts limit:3 %}
-                  <li>
-                    <p><a href="{{ post.url | prepend: site.url }}">{{ post.title }}</a><small>&nbsp;&nbsp;{{ post.date | date_to_string }}</small></p>
-                  </li>
-                {% endfor %}
-              </ul>
-            </div>
-          {% endif %}
-        {% endif %}
-        <br>
+  {% if page.layout == "post" %}
+    {% if page.series %}
+      {% include series-widget.html %}
+    {% endif %}
+    {% include related-articles-widget.html %}
+    {% include book-widget.html %}
+  {% endif %}
+  <br>
 </div>