diff --git a/templates/cv-content.html b/templates/cv-content.html
index 9ee3879..633e9a2 100644
--- a/templates/cv-content.html
+++ b/templates/cv-content.html
@@ -91,45 +91,20 @@
                         {{end}}
                     </div>
                     <div class="experience-content">
-                        <div class="experience-header">
-                            <div class="experience-title-line">
-                                <h4 class="position">
-                                    <span class="position-title">{{.Position}}</span>
-                                    {{if .Company}}
-                                        {{if .CompanyURL}}
-                                            <a href="{{.CompanyURL}}" target="_blank" rel="noopener noreferrer" class="company-link">{{.Company}}</a>
-                                        {{else}}
-                                            <span class="company-name">{{.Company}}</span>
-                                        {{end}}
-                                    {{end}}
-                                    {{if .Current}}
-                                        <span class="current-badge">{{if eq $.Lang "es"}}ACTUAL{{else}}CURRENT{{end}}</span>
-                                    {{end}}
-                                    {{if .Expired}}
-                                        <span class="expired-badge">{{if eq $.Lang "es"}}EXPIRADO{{else}}EXPIRED{{end}}</span>
-                                    {{end}}
-                                </h4>
-                                <span class="experience-period">{{.StartDate}} / {{if .Current}}{{if eq $.Lang "es"}}presente{{else}}now{{end}}{{else}}{{.EndDate}}{{end}}</span>
-                                {{if .Duration}}
-                                <span class="experience-separator">&nbsp;-&nbsp;</span>
-                                <span class="experience-duration">{{.Duration}}</span>
-                                {{end}}
-                                <span class="experience-separator">&nbsp;-&nbsp;</span>
-                                <span class="experience-location">({{.Location}})</span>
-                            </div>
-                        </div>
+                        <strong>{{.Position}}{{if .Company}} - {{if .CompanyURL}}<a href="{{.CompanyURL}}" target="_blank" rel="noopener noreferrer">{{.Company}}</a>{{else}}{{.Company}}{{end}}{{end}}</strong><br>
+                        <small>{{.StartDate}} / {{if .Current}}{{if eq $.Lang "es"}}presente{{else}}now{{end}}{{else}}{{.EndDate}}{{end}} - ({{.Location}})</small>
 
                         {{if .ShortDescription}}
-                        <p class="short-desc">{{.ShortDescription | safeHTML}}</p>
+                        <p class="experience-desc short-desc">{{.ShortDescription | safeHTML}}</p>
                         {{end}}
 
-                        <div class="long-only">
-                            <ul class="responsibilities">
-                                {{range .Responsibilities}}
-                                <li>{{. | safeHTML}}</li>
-                                {{end}}
-                            </ul>
-                        </div>
+                        {{if .Responsibilities}}
+                        <ul class="responsibilities long-only">
+                            {{range .Responsibilities}}
+                            <li>{{. | safeHTML}}</li>
+                            {{end}}
+                        </ul>
+                        {{end}}
                     </div>
                 </div>
                 {{end}}
@@ -211,35 +186,8 @@
                     </div>
                     {{end}}
                     <div class="project-content">
-                        <div class="project-header">
-                            <h4 class="project-title">
-                                <span class="project-title-text">
-                                    {{if .URL}}
-                                        <a href="{{.URL}}" target="_blank" rel="noopener noreferrer">{{.Title}}</a>
-                                    {{else}}
-                                        {{.Title}}
-                                    {{end}}
-                                </span>
-                                {{if .Current}}
-                                    <span class="current-badge">{{if eq $.Lang "es"}}ACTUAL{{else}}CURRENT{{end}}</span>
-                                {{end}}
-                                {{if .MaintainedBy}}
-                                    <span class="maintained-badge">{{if eq $.Lang "es"}}MANTENIDO POR{{else}}MAINTAINED BY{{end}} {{.MaintainedBy}}</span>
-                                {{end}}
-                            </h4>
-                            <span class="project-period">
-                                {{if .StartDate}}{{.StartDate}}{{end}}
-                                {{if .Current}}
-                                    {{if .DynamicDate}}
-                                        / {{.DynamicDate}}
-                                    {{else}}
-                                        / {{if eq $.Lang "es"}}presente{{else}}now{{end}}
-                                    {{end}}
-                                {{end}}
-                            </span>
-                            <span class="project-separator">&nbsp;-&nbsp;</span>
-                            <span class="project-location">({{.Location}})</span>
-                        </div>
+                        <strong>{{if .URL}}<a href="{{.URL}}" target="_blank" rel="noopener noreferrer">{{.Title}}</a>{{else}}{{.Title}}{{end}}</strong><br>
+                        <small>{{if .StartDate}}{{.StartDate}}{{if .Current}}{{if .DynamicDate}} / {{.DynamicDate}}{{else}} / {{if eq $.Lang "es"}}presente{{else}}now{{end}}{{end}}{{end}}{{end}} - ({{.Location}})</small>
 
                         {{if .ShortDescription}}
                         <p class="project-desc short-desc">{{.ShortDescription | safeHTML}}</p>
@@ -290,19 +238,8 @@
                     </div>
                     {{end}}
                     <div class="course-content">
-                        <div class="course-header">
-                            <h4 class="course-title">
-                                <span class="course-title-text">{{.Title}}</span>
-                                <span class="course-institution">{{.Institution}}</span>
-                            </h4>
-                            <span class="course-period">{{.Date}}</span>
-                            {{if .Duration}}
-                            <span class="course-separator">&nbsp;-&nbsp;</span>
-                            <span class="course-duration">{{.Duration}}</span>
-                            {{end}}
-                            <span class="course-separator">&nbsp;-&nbsp;</span>
-                            <span class="course-location">({{.Location}})</span>
-                        </div>
+                        <strong>{{.Title}}</strong><br>
+                        <small>{{.Institution}} - {{.Date}} - ({{.Location}})</small>
 
                         {{if .ShortDescription}}
                         <p class="course-desc short-desc">{{.ShortDescription | safeHTML}}</p>