diff --git a/src/_includes/hero.liquid b/src/_includes/hero.liquid
index 564949b..02cb51c 100644
--- a/src/_includes/hero.liquid
+++ b/src/_includes/hero.liquid
@@ -3,6 +3,6 @@
     <h1 class="hero-title">{% if subpage.data.displayedTitle %}{{ subpage.data.displayedTitle }}{% else %}{{ subpage.data.title }}{% endif %}</h1>
     <p>{{subpage.data.description}}</p>
     {{ subpage.templateContent }}
-    {% include "partials/socials-label.liquid" %}
+    {% render 'partials/components/socials.liquid', socials: author.socials, mail: author.mail, showLabel: true %}
   </div>
 </section>
\ No newline at end of file
diff --git a/src/_includes/page.liquid b/src/_includes/page.liquid
index e30df18..9aee469 100644
--- a/src/_includes/page.liquid
+++ b/src/_includes/page.liquid
@@ -6,9 +6,4 @@
     <h2>{{ subpage.data.title }}</h2>
   {% endif %}
   {{ subpage.templateContent }}
-  {% if subpage.data.socials %}
-    {% if subpage.data.socials.github %}
-      {% include "partials/icons/github.html" %}
-    {% endif %} 
-  {% endif %} 
 </section>
\ No newline at end of file
diff --git a/src/_includes/partials/components/socials.liquid b/src/_includes/partials/components/socials.liquid
new file mode 100644
index 0000000..c8775f5
--- /dev/null
+++ b/src/_includes/partials/components/socials.liquid
@@ -0,0 +1,10 @@
+<ul class="list-inline socials-list {% if showLabel == true %}socials-list--label{% endif %}">
+  {% if socials %}
+    {% for social in socials %}
+      <li><a href="{{ social.link }}" class="{{ social.icon }} {% if showLabel == true %}{{ position | default: "icon--left" }}{% endif %}" title="{{ social.title }}" target="_blank">{% if showLabel == true %}{{ social.title }}{% endif %}</a></li>
+    {% endfor %}
+    {% if mail %}
+      <li><a href="mailto:{{ mail }}" class="icon-mail {% if showLabel == true %}{{ position | default: "icon--left" }}{% endif %}" title="Send me an e-mail" target="_blank">{% if showLabel == true %}Send me an e-mail{% endif %}</a></li>
+    {% endif %}
+  {% endif %}
+</ul>
\ No newline at end of file
diff --git a/src/_includes/partials/components/timeline-item.liquid b/src/_includes/partials/components/timeline-item.liquid
new file mode 100644
index 0000000..334aac1
--- /dev/null
+++ b/src/_includes/partials/components/timeline-item.liquid
@@ -0,0 +1,8 @@
+<li>
+  <h3><time datetime="{{ start }}">{{ start }}</time><span>-</span><time datetime="{{ end }}">{{ end }}</time></h3>
+  <p>
+    <strong>{% if link %}<a href="{{ link }}">{% endif %}{{ title }}{% if link %}</a>{% endif %}</strong>,
+    {{ location }}
+  </p>
+  <p>{{ description }}</p>
+</li>
\ No newline at end of file
diff --git a/src/_includes/partials/components/timeline.liquid b/src/_includes/partials/components/timeline.liquid
new file mode 100644
index 0000000..69c1feb
--- /dev/null
+++ b/src/_includes/partials/components/timeline.liquid
@@ -0,0 +1,12 @@
+<ol class="timeline">
+  {%- for elements in timeline -%}
+    {% assign data = elements.data %}
+    {% render 'partials/components/timeline-item', 
+        start: data.startDate, 
+        end: data.endDate, 
+        link: data.link, 
+        title: data.title, 
+        location: data.location, 
+        description: data.description %}
+  {%- endfor -%}
+</ol>
\ No newline at end of file
diff --git a/src/_includes/partials/experience.liquid b/src/_includes/partials/experience.liquid
deleted file mode 100644
index 26d5e65..0000000
--- a/src/_includes/partials/experience.liquid
+++ /dev/null
@@ -1,12 +0,0 @@
-<ol class="timeline">
-  {%- for experience in experiences -%}
-    <li>
-      <h3><time datetime="{{ experience.data.startDate }}">{{ experience.data.startDate }}</time><span>-</span><time datetime="{{ experience.data.endDate }}">{{ experience.data.endDate }}</time></h3>
-      <p>
-        <strong>{% if experience.data.link %}<a href="{{experience.data.link}}">{% endif %}{{ experience.data.title }}{% if experience.data.link %}</a>{% endif %}</strong>,
-        {{ experience.data.location }}
-      </p>
-      <p>{{ experience.data.description }}</p>
-    </li>
-  {%- endfor -%}
-</ol>
\ No newline at end of file
diff --git a/src/_includes/partials/footer.liquid b/src/_includes/partials/footer.liquid
index 7b18703..eaf8f9d 100644
--- a/src/_includes/partials/footer.liquid
+++ b/src/_includes/partials/footer.liquid
@@ -6,7 +6,7 @@
                 <li>Source on <a href="{{site.repository}}" target="_blank" rel="nofollow">{{site.repoSrc}}</a></li>
             {% endif %}
         </ul>
-    
-        {% include "partials/socials.liquid" %}
+        
+        {% render 'partials/components/socials.liquid', socials: author.socials, mail: author.mail, showLabel: false %}
     </div>
 </footer>
\ No newline at end of file
diff --git a/src/_includes/partials/post-list.html b/src/_includes/partials/post-list.html
deleted file mode 100644
index 657c074..0000000
--- a/src/_includes/partials/post-list.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<section class="projects">
-    <ol reversed class="postlist">
-      {%- for posts in postslist -%}
-        <li>
-          <h2>{{ posts.data.title }}</h2>
-        </li>
-      {%- endfor -%}
-    </ol>
-  </section>
\ No newline at end of file
diff --git a/src/_includes/partials/socials-label.liquid b/src/_includes/partials/socials-label.liquid
deleted file mode 100644
index 6b917d1..0000000
--- a/src/_includes/partials/socials-label.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-<ul class="list-inline socials-list socials-list--label">
-  {% if author.socials %}
-    {% for social in author.socials %}
-      <li><a href="{{ social.link }}" class="icon--left {{ social.icon }}" target="_blank">{{ social.title }}</a></li>
-    {% endfor %}
-    {% if author.mail %}
-      <li><a href="mailto:{{ author.mail }}" class="icon--left icon-mail" target="_blank">Send me an e-mail</a></li>
-    {% endif %} 
-  {% endif %} 
-</ul>
\ No newline at end of file
diff --git a/src/_includes/partials/socials.liquid b/src/_includes/partials/socials.liquid
deleted file mode 100644
index f1ede2c..0000000
--- a/src/_includes/partials/socials.liquid
+++ /dev/null
@@ -1,10 +0,0 @@
-<ul class="list-inline socials-list">
-  {% if author.socials %}
-    {% for social in author.socials %}
-      <li><a href="{{ social.link }}" class="{{ social.icon }}" title="{{ social.title }}" target="_blank"></a></li>
-    {% endfor %}
-    {% if author.mail %}
-      <li><a href="mailto:{{ author.mail }}" class="icon-mail" title="Send me an e-mail" target="_blank"></a></li>
-    {% endif %} 
-  {% endif %} 
-</ul>
\ No newline at end of file
diff --git a/src/pages/subpages/experiences.liquid b/src/pages/subpages/experiences.liquid
index f680604..b231391 100644
--- a/src/pages/subpages/experiences.liquid
+++ b/src/pages/subpages/experiences.liquid
@@ -5,4 +5,4 @@ classes: 'experiences-section'
 ---
 
 {% assign experiences = collections.experiences %}
-{% include 'partials/experience.liquid' %}
\ No newline at end of file
+{% render 'partials/components/timeline', timeline: experiences %}
\ No newline at end of file