diff --git a/messages.pot b/messages.pot
index e99e58b..0c8e561 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-08-15 05:37+0200\n"
+"POT-Creation-Date: 2024-08-15 05:58+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -100,6 +100,10 @@ msgstr ""
 msgid "resume volunteer title"
 msgstr ""
 
+#: templates/partials/volunteer.html:39 templates/partials/work.html:34
+msgid "resume present phrase"
+msgstr ""
+
 #: templates/partials/work.html:5
 msgid "resume work title"
 msgstr ""
diff --git a/templates/partials/basics.html b/templates/partials/basics.html
index 20e63c5..292f369 100644
--- a/templates/partials/basics.html
+++ b/templates/partials/basics.html
@@ -16,12 +16,6 @@
 
 		{% if basics.location %}
 		<span class="location">
-			{% if basics.location.address %}
-			<span class="address">{{ basics.location.address }},</span>
-			{% endif %}
-			{% if basics.location.postalCode %}
-			<span class="postalCode">{{ basics.location.postalCode }},</span>
-			{% endif %}
 			{% if basics.location.city %}
 			<span class="city">{{ basics.location.city }},</span>
 			{% endif %}
diff --git a/templates/partials/volunteer.html b/templates/partials/volunteer.html
index 330e1ac..32cca46 100644
--- a/templates/partials/volunteer.html
+++ b/templates/partials/volunteer.html
@@ -19,74 +19,73 @@
       {% endif %}
 
       <header class="clear">
-        <div class="header-left">
+        <div class="header-left flex">
           {% if volunteer_item.position %}
-          <div class="position">
-            {{ volunteer_item.position }}
-          </div>
+            <div class="position">
+              {{ volunteer_item.position }}
+            </div>
           {% endif %}
-          <div class="organization">
-            {{ volunteer_item.organization }}
+          <div class="date flex-grow text-right">
+            {% if volunteer_item.startDate %}
+              <span class="startDate">{{ utils.format_date_short(volunteer_item.startDate) }}</span>
+            {% endif %}
+            {% if not utils.isinfinite(volunteer_item.endDate) %}
+              <span class="endDate">- {{ utils.format_date_short(volunteer_item.endDate) }}</span>
+            {% else %}
+              <span class="endDate">- {% trans %}resume present phrase{% endtrans %}</span>
+            {% endif %}
           </div>
         </div>
-        <div class="date">
-          {% if volunteer_item.startDate %}
-          <span class="startDate">
-          {{ volunteer_item.startDate }}
-          </span>
-          {% endif %}
-          {% if volunteer_item.endDate %}
-          <span class="endDate">
-          - {{ volunteer_item.endDate }}
-          </span>
-          {% else %}
-          <span class="endDate">
-          - {{ language.phrases.present }}
-          </span>
+        <div class="organization">
+          <i class="fa-solid fa-building-ngo mr-2"></i>
+          {{ volunteer_item.organization }}
+          {% if volunteer_item.url %}
+            <span class="website text-italic">
+              <i>
+                <a href="{{ volunteer_item.url }}">(website)</a>
+              </i>
+            </span>
           {% endif %}
         </div>
+
       </header>
       {% endif %}
-      {% if volunteer_item.url %}
-      <div class="website">
-        <a href="{{ volunteer_item.url }}">{{ volunteer_item.url }}</a>
-      </div>
-      {% endif %}
+
       {% if volunteer_item.location %}
-      <span class="location">
-      <span class="fas fa-map-marker-alt"></span>
-      {% if volunteer_item.city %}
-      <span class="city">
-      {{ volunteer_item.city }},
-      </span>
-      {% endif %}
-      {% if volunteer_item.countryCode %}
-      <span class="countryCode">
-      ({{ volunteer_item.countryCode }})
-      </span>
-      {% endif %}
-      {% if volunteer_item.region %}
-      <span class="region">
-      {{ volunteer_item.region }}
-      </span>
-      {% endif %}
-      </span>
+        <span class="location">
+        <span class="fas fa-map-marker-alt"></span>
+        {% if volunteer_item.city %}
+          <span class="city">
+          {{ volunteer_item.city }},
+          </span>
+        {% endif %}
+        {% if volunteer_item.countryCode %}
+          <span class="countryCode">
+          ({{ volunteer_item.countryCode }})
+          </span>
+        {% endif %}
+        {% if volunteer_item.region %}
+          <span class="region">
+          {{ volunteer_item.region }}
+          </span>
+        {% endif %}
+        </span>
       {% endif %}
       {% if volunteer_item.keywords %}
-      <ul class="keywords">
-        {% for keyword in volunteer_item.keywords %}
-        <li>{{ keyword }}</li>
-        {% endfor %}
-      </ul>
+        <ul class="keywords">
+          {% for keyword in volunteer_item.keywords %}
+          <li>{{ keyword }}</li>
+          {% endfor %}
+        </ul>
       {% endif %}
       <div class="item">
         {% if volunteer_item.summary %}
           <div class="summary">{{ volunteer_item.summary | replace("\r\n", "<br>") | replace("\n", "<br>") | replace("\r", "<br>") }}</div>
         {% endif %}
         {% if volunteer_item.highlights %}
-        <ul class="highlights">
+        <ul class="highlights grid grid-cols-4 gap-4">
           {% for highlight in volunteer_item.highlights %}
-          <li>{{ highlight | replace("\r\n", "<br>") | replace("\n", "<br>") | replace("\r", "<br>") }}</li>
+          <li class="bg-slate-700 rounded-md ring-2 ring-blue-500/50  text-center">{{ highlight | replace("\r\n", "<br>") | replace("\n", "<br>") | replace("\r", "<br>") }}</li>
           {% endfor %}
         </ul>
         {% endif %}
diff --git a/templates/partials/work.html b/templates/partials/work.html
index f509aa5..9ca5f05 100644
--- a/templates/partials/work.html
+++ b/templates/partials/work.html
@@ -26,18 +26,18 @@
           {% endif %}
           <div class="date flex-grow text-right">
             {% if work_item.startDate %}
-      <span class="startDate">{{ utils.format_date_short(work_item.startDate) }}</span>
+              <span class="startDate">{{ utils.format_date_short(work_item.startDate) }}</span>
             {% endif %}
             {% if not utils.isinfinite(work_item.endDate) %}
-            <span class="endDate">- {{ utils.format_date_short(work_item.endDate) }}</span>
+              <span class="endDate">- {{ utils.format_date_short(work_item.endDate) }}</span>
             {% else %}
-            <span class="endDate">- {{ language.phrases.present }}</span>
+              <span class="endDate">- {% trans %}resume present phrase{% endtrans %}</span>
             {% endif %}
           </div>
         </div>
 
 	      <div class="company">
-          <i class="fa-solid fa-building"></i>
+          <i class="fa-solid fa-building mr-2"></i>
           {{ work_item.name }}
           {% if work_item.url %}
             <span class="website">
diff --git a/translations/en/LC_MESSAGES/messages.mo b/translations/en/LC_MESSAGES/messages.mo
index 0f96f81..acff6f1 100644
Binary files a/translations/en/LC_MESSAGES/messages.mo and b/translations/en/LC_MESSAGES/messages.mo differ
diff --git a/translations/en/LC_MESSAGES/messages.po b/translations/en/LC_MESSAGES/messages.po
index b2d6acd..7ccbd75 100644
--- a/translations/en/LC_MESSAGES/messages.po
+++ b/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-08-15 05:37+0200\n"
+"POT-Creation-Date: 2024-08-15 05:58+0200\n"
 "PO-Revision-Date: 2024-08-14 18:17+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -101,6 +101,10 @@ msgstr "Beginner"
 msgid "resume volunteer title"
 msgstr "Volunteer"
 
+#: templates/partials/volunteer.html:39 templates/partials/work.html:34
+msgid "resume present phrase"
+msgstr "Now"
+
 #: templates/partials/work.html:5
 msgid "resume work title"
 msgstr "Professional experience"
diff --git a/translations/fr/LC_MESSAGES/messages.mo b/translations/fr/LC_MESSAGES/messages.mo
index f35c4f5..833a7ab 100644
Binary files a/translations/fr/LC_MESSAGES/messages.mo and b/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/translations/fr/LC_MESSAGES/messages.po b/translations/fr/LC_MESSAGES/messages.po
index fd6268d..40c849e 100644
--- a/translations/fr/LC_MESSAGES/messages.po
+++ b/translations/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-08-15 05:37+0200\n"
+"POT-Creation-Date: 2024-08-15 05:58+0200\n"
 "PO-Revision-Date: 2024-08-14 18:17+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: fr\n"
@@ -101,6 +101,10 @@ msgstr "Débutant"
 msgid "resume volunteer title"
 msgstr "Bénévolat"
 
+#: templates/partials/volunteer.html:39 templates/partials/work.html:34
+msgid "resume present phrase"
+msgstr "Présent"
+
 #: templates/partials/work.html:5
 msgid "resume work title"
 msgstr "Expérience Professionnelle"