diff --git a/resume_manager_core/templates/resume_manager/_display_recurse.html b/resume_manager_core/templates/resume_manager/_display_recurse.html
index b2dee2b89195c99ef05abd4a9e3c646d947251bd..2659f711bb4d2635ca3296a7d8c4e411b6479305 100644
--- a/resume_manager_core/templates/resume_manager/_display_recurse.html
+++ b/resume_manager_core/templates/resume_manager/_display_recurse.html
@@ -20,55 +20,15 @@
{% endif %}
</div>
{% elif data.display_category == 'Contact' %}
- {% include 'resume_manager/include/contact.html' with data=content.contact %}
+ {% include 'resume_manager/include/contact.html' with data=content.contact description=data.description %}
{% elif data.display_category == 'Education' %}
- {% include 'resume_manager/include/education.html' with data=content.education %}
+ {% include 'resume_manager/include/education.html' with data=content.education description=data.description %}
{% elif data.display_category == 'Experience' %}
- {% include 'resume_manager/include/experience.html' with data=content.experience %}
+ {% include 'resume_manager/include/experience.html' with data=content.experience description=data.description %}
{% elif data.display_category == 'Skills' %}
- {% include 'resume_manager/include/skills.html' with data=content.skills %}
- {% endif %}
-
-
-
-
-
-
- {% if data.section_header %}
- <p>{{ data.section_header }}</p>
- {% endif %}
-
- {% if data.section_key_value_pairs %}
- <ul>
- {% for key_value in data.section_key_value_pairs %}
- <li>
- <p>
- <span class="bold">{{ key_value.data_key }}</span>:
- {{ key_value.data_value }}
- </p>
- </li>
- {% endfor %}
- </ul>
- {% endif %}
-
- {% if data.section_items %}
- <ul>
- {% for data_item in data.section_items %}
- {% if data_item.title_left or data_item.title_right %}
- <h4>
- {% if data_item.title_left %}
- <span class="align-left">{{ data_item.title_left }}</span>
- {% endif %}
- {% if data_item.title_right %}
- <span class="align-right">{{ data_item.title_right }}</span>
- {% endif %}
- </h4>
- {% endif %}
- <li {% if not show_bullet_point %}class="no-bullet"{% endif %}>
- <p>{{ data_item.item }}</p>
- </li>
- {% endfor %}
- </ul>
+ {% include 'resume_manager/include/skills.html' with data=content.skills description=data.description %}
+ {% elif data.display_category == 'References' %}
+ {% include 'resume_manager/include/references.html' with data=content.references description=data.description %}
{% endif %}
{% include 'resume_manager/_display_recurse.html' with data_subsection=data.section_children name=name profession=profession %}
diff --git a/resume_manager_core/templates/resume_manager/display.html b/resume_manager_core/templates/resume_manager/display.html
index aebf5969696786f97fc6ec74ec049efd96ced913..01df4c688fe047ac91603572cf51ed99109aff82 100644
--- a/resume_manager_core/templates/resume_manager/display.html
+++ b/resume_manager_core/templates/resume_manager/display.html
@@ -36,6 +36,7 @@
{% include 'resume_manager/_display_recurse.html' with data_subsection=resume_data content=resume_content %}
+ {% comment %}
<hr>
<p>User & Profession:</p>
@@ -57,6 +58,7 @@
{% include 'resume_manager/_display_recurse_debug.html' with data_subsection=resume_data %}
<hr>
+ {% endcomment %}
</body>
{% endblock body %}
diff --git a/resume_manager_core/templates/resume_manager/include/contact.html b/resume_manager_core/templates/resume_manager/include/contact.html
index 081a9b6af3849129bb95c8bbbbf0ca0601ed6849..df185fd0f202539621864bcf7644c262685bd28f 100644
--- a/resume_manager_core/templates/resume_manager/include/contact.html
+++ b/resume_manager_core/templates/resume_manager/include/contact.html
@@ -1,38 +1,58 @@
<h3>Contact Information</h3>
+
+{% if description %}
+ <p class="emphasis">{{ description }}</p>
+{% endif %}
+
+
<div class="flex flex-vertical">
- <p class="flex flex-horizontal flex-align-start">
+ <p class="flex flex-horizontal flex-align-start padding-02">
<span class="descriptor font-size-small">Address:</span> {{ data.address }}
</p>
- <p class="flex flex-horizontal flex-justify-space-between">
+ <p class="flex flex-horizontal flex-justify-space-between padding-02">
<span>
- <span class="descriptor font-size-small">Phone:</span> {{ data.phone_number }}
+ <span class="descriptor font-size-small">Phone:</span>
+ <a href="tel:{{ data.phone_number }}">{{ data.phone_number.as_national }}</a>
</span>
<span>
- <span class="descriptor font-size-small">Email:</span> {{ data.email }}
+ <span class="descriptor font-size-small">Email:</span>
+ <a href="mailto:{{ data.email }}">{{ data.email }}</a>
</span>
</p>
{% if data.website or data.linkedin %}
- <p class="flex flex-horizontal flex-justify-space-between">
+ <p class="flex flex-horizontal flex-justify-space-between padding-02">
{% if data.website %}
- <span><span class="descriptor font-size-small">Website:</span> {{ data.website }}</span>
+ <span><span class="descriptor font-size-small">Website:</span>
+ <a href="{{ data.website }}">{{ data.website }}</a>
+ </span>
{% endif %}
{% if data.linkedin %}
- <span><span class="descriptor font-size-small">LinkedIn:</span> {{ data.linkedin }}</span>
+ <span><span class="descriptor font-size-small">LinkedIn:</span>
+ <a href="https://linkedin.com/in/{{ data.linkedin }}">
+ https://linkedin.com/in/{{ data.linkedin }}
+ </a>
+ </span>
{% endif %}
</p>
{% endif %}
{% if data.git or data.art_station %}
- <p class="flex flex-horizontal flex-justify-space-between">
+ <p class="flex flex-horizontal flex-justify-space-between padding-02">
{% if data.git %}
- <span><span class="descriptor font-size-small">Git:</span> {{ data.git }}</span>
+ <span>
+ <span class="descriptor font-size-small">Git:</span>
+ <a href="{{ data.git }}">{{ data.git }}</a>
+ </span>
{% endif %}
{% if data.art_station %}
- <span><span class="descriptor font-size-small">ArtStation:</span> {{ data.art_station }}</span>
+ <span>
+ <span class="descriptor font-size-small">ArtStation:</span>
+ <a href="{{ data.artstation }}">{{ data.art_station }}</a>
+ </span>
{% endif %}
</p>
{% endif %}
diff --git a/resume_manager_core/templates/resume_manager/include/education.html b/resume_manager_core/templates/resume_manager/include/education.html
index 94338ae866c3d06dbf17e7f100b3bbfd0144a415..7f86e04c4044179f8b5012a0fb05d08488b8ff3b 100644
--- a/resume_manager_core/templates/resume_manager/include/education.html
+++ b/resume_manager_core/templates/resume_manager/include/education.html
@@ -1,6 +1,12 @@
<h3>Education</h3>
+
+{% if description %}
+ <p class="emphasis">{{ description }}</p>
+{% endif %}
+
+
<div class="flex flex-vertical">
{% for education in data %}
@@ -42,6 +48,10 @@
</div>
+ {% empty %}
+
+ <p>No education yet.</p>
+
{% endfor %}
</div>
diff --git a/resume_manager_core/templates/resume_manager/include/experience.html b/resume_manager_core/templates/resume_manager/include/experience.html
index b44577016cce5528d7f4a8d3b9060df0a1da88e6..4e6422dda73da03527df87becff67c42af9e3913 100644
--- a/resume_manager_core/templates/resume_manager/include/experience.html
+++ b/resume_manager_core/templates/resume_manager/include/experience.html
@@ -1,4 +1,44 @@
<h3>Experience</h3>
-<div></div>
+
+{% if description %}
+ <p class="emphasis">{{ description }}</p>
+{% endif %}
+
+
+<div class="flex flex-vertical">
+
+ {% for experience in data %}
+
+ <div class="flex flex-vertical subsection">
+
+ <p class="flex flex-horizontal flex-justify-space-between">
+ <span class="descriptor">{{ experience.name }} - {{ experience.position }}</span>
+ </span>
+ <span class="descriptor">
+ {{ experience.date_start|date:"M Y" }}
+ -
+ {% if experience.date_end %}
+ {{ experience.date_end|date:"M Y" }}
+ {% else %}
+ Present
+ {% endif %}
+ </span>
+ </p>
+
+ {% if experience.description %}
+ <p class="align-justify padding-05 font-size-small">
+ {{ experience.description }}
+ </p>
+ {% endif %}
+
+ </div>
+
+ {% empty %}
+
+ <p>No experience yet.</p>
+
+ {% endfor %}
+
+</div>
diff --git a/resume_manager_core/templates/resume_manager/include/references.html b/resume_manager_core/templates/resume_manager/include/references.html
new file mode 100644
index 0000000000000000000000000000000000000000..27f9903e5c05f121655cf0d9eca32f48046bd6e9
--- /dev/null
+++ b/resume_manager_core/templates/resume_manager/include/references.html
@@ -0,0 +1,36 @@
+
+<h3>References</h3>
+
+
+{% if description %}
+ <p class="emphasis">{{ description }}</p>
+{% endif %}
+
+
+<div class="flex flex-vertical">
+ {% for reference in data %}
+ <div class="flex flex-vertical">
+
+ <p class="flex flex-horizontal flex-justify-space-between padding-02">
+ <span class="descriptor">{{ reference.name }}</span>
+ <span>
+ <span class="descriptor font-size-small">Email:</span>
+ <a href="mailto:{{ reference.email }}">{{ reference.email }}</a>
+ </span>
+ </p>
+
+ <p class="flex flex-horizontal flex-justify-space-between padding-02">
+ <span>{{ reference.company }}</span>
+ <span>
+ <span class="descriptor font-size-small">Phone:</span>
+ <a href="tel{{ reference.phone_number }}">{{ reference.phone_number.as_national }}</a>
+ </span>
+ </p>
+
+ </div>
+ {% empty %}
+
+ <p>No references yet.</p>
+
+ {% endfor %}
+</div>
diff --git a/resume_manager_core/templates/resume_manager/include/skills.html b/resume_manager_core/templates/resume_manager/include/skills.html
index e35e8dbbcfbae495936994814df50f767d07af2c..8aacffa92aed0c97cf91e8bb332781702e9268e1 100644
--- a/resume_manager_core/templates/resume_manager/include/skills.html
+++ b/resume_manager_core/templates/resume_manager/include/skills.html
@@ -1,11 +1,17 @@
-<h3 class="underline">Skills</h3>
+<h3 class="underline">Skills & Technologies</h3>
+
+
+{% if description %}
+ <p class="emphasis">{{ description }}</p>
+{% endif %}
+
<div class="flex flex-align-start flex-wrap flex-ratio-100">
{% if data %}
{% for category in data %}
- <div class="flex flex-vertical flex-justify-space-between flex-ratio-100">
- <h4 class="padding-05">{{ category.category }}</h4>
+ <div class="flex flex-vertical flex-justify-space-between flex-ratio-100 max-width-33">
+ <h4 class="align-left emphasis padding-05">{{ category.category }}</h4>
<ul class="flex flex-vertical flex-align-start flex-ratio-100">
{% for skill in category.skills %}
<li class="padding-05"><p> - {{ skill }}</p></li>