diff --git a/partials/html/section/education.html b/partials/html/section/education.html
index b634c2f..eab56a1 100644
--- a/partials/html/section/education.html
+++ b/partials/html/section/education.html
@@ -5,11 +5,13 @@
     {{> header-icon _title="EDUCATION" _section="education" _hdricon=(lookup . '_icon') }}
   {{/header-education}}
   {{#each r.education.history}}
+    {{#> body-education }}
     <div>
     <h3>{{{ institution }}}</h3>
     <span class="tenure">{{dateRange .}}</span>
     {{> highlights }}
     </div>
+    {{/body-education}}
   {{/each}}
 </section>
 {{/section}}
diff --git a/partials/html/section/employment.html b/partials/html/section/employment.html
index 83629df..459e2bf 100644
--- a/partials/html/section/employment.html
+++ b/partials/html/section/employment.html
@@ -6,6 +6,7 @@
   {{/header-employment}}
 
   {{#each r.employment.history}}
+    {{#> body-employment }}
     <div>
       <h3><em>{{ position }}</em>,
         {{#if url }}
@@ -15,12 +16,11 @@
         {{/if}}
         </h3>
         <span class="tenure">{{dateRange .}}</span>
-        {{#if keywords}}
-        | <span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
-        {{/if}}
       <p>{{{ summary }}}</p>
       {{> highlights }}
+      {{#if keywords}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>{{/if}}      
     </div>
+    {{/body-employment}}
   {{/each}}
 </section>
 {{/section}}
diff --git a/partials/html/section/projects.html b/partials/html/section/projects.html
index f2c05c0..db66aba 100644
--- a/partials/html/section/projects.html
+++ b/partials/html/section/projects.html
@@ -5,6 +5,7 @@
     {{> header-icon _title="PROJECTS" _section="projects" _hdricon=(lookup . '_icon') }}
   {{/header-projects}}
   {{#each r.projects }}
+    {{#> body-projects }}
     <div>
     <h3>{{#if role}}<em>{{camelCase role }}</em>,{{/if}}
     {{#if url}}
@@ -14,12 +15,13 @@
     {{/if}}
     </h3>
     {{#if start}}<span class="tenure">{{dateRange .}}</span>{{/if}}
-    {{#if keywords}}
-    {{#if start}}| {{/if}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
-    {{/if}}
     {{{ summary }}}
     {{> highlights }}
+    {{#if keywords}}
+    {{#if start}}| {{/if}}<span class="keywords">{{#each keywords}}{{{ . }}} {{/each}}</span>
+    {{/if}}    
     </div>
+    {{/body-projects }}
   {{/each}}
 </section>
 {{/section}}
diff --git a/partials/html/section/recognition.html b/partials/html/section/recognition.html
index ea30bf8..a70461f 100644
--- a/partials/html/section/recognition.html
+++ b/partials/html/section/recognition.html
@@ -5,11 +5,14 @@
     {{> header-icon _title="RECOGNITION" _section="recognition" _hdricon=(lookup . '_icon') }}
   {{/header-recognition}}
   {{#each r.recognition}}
+    {{#> body-recognition }}
     <div>
-    <h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
+    <h3><em>{{ title }}</em>, {{ from }}</h3>
+    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
     {{ summary }}
     {{> highlights }}
     </div>
+    {{/body-recognition}}
   {{/each}}
 </section>
 {{/section}}
diff --git a/partials/html/section/references.html b/partials/html/section/references.html
index e27d024..3f50723 100644
--- a/partials/html/section/references.html
+++ b/partials/html/section/references.html
@@ -5,10 +5,12 @@
     {{> header-icon _title="REFERENCES" _section="references" _hdricon=(lookup . '_icon') }}
   {{/header-references}}
   {{#each r.references}}
+    {{#> body-references }}
     <div>
     <h3><em>{{ name }}</em></h3>
     {{ summary }}
     </div>
+    {{/body-references}}
   {{/each}}
 </section>
 {{/section}}
diff --git a/partials/html/section/samples.html b/partials/html/section/samples.html
index ec02658..9e3c3cb 100644
--- a/partials/html/section/samples.html
+++ b/partials/html/section/samples.html
@@ -5,6 +5,7 @@
     {{> header-icon _title="SAMPLES" _section="samples" _hdricon=(lookup . '_icon') }}
   {{/header-samples}}
   {{#each r.samples}}
+    {{#> body-samples }}
     <div>
     <h3>
     {{#if url}}
@@ -12,10 +13,12 @@
     {{else}}
     {{ title }}
     {{/if}}
-    <span class="tenure">{{formatDate safe.date 'YYYY-MM'}}</span></h3>
+    </h3>
+    <span class="tenure">{{formatDate safe.date 'YYYY-MM'}}</span>
     {{{ summary }}}
     {{> highlights }}
     </div>
+    {{/body-samples}}
   {{/each}}
 </section>
 {{/section}}
diff --git a/partials/html/section/service.html b/partials/html/section/service.html
index 497744e..924b3c9 100644
--- a/partials/html/section/service.html
+++ b/partials/html/section/service.html
@@ -5,6 +5,7 @@
     {{> header-icon _title="SERVICE" _section="service" _hdricon=(lookup . '_icon') }}
   {{/header-samples}}
   {{#each r.service.history}}
+    {{#> body-service }}
     <div>
     <h3><em>{{ position }}</em>,
       {{#if url}}
@@ -17,6 +18,7 @@
     <p style="clear: both;">{{{ summary }}}</p>
     {{> highlights }}
     </div>
+    {{/body-service }}
   {{/each}}
 </section>
 {{/section}}
diff --git a/partials/html/section/speaking.html b/partials/html/section/speaking.html
index 9690625..e1665c1 100644
--- a/partials/html/section/speaking.html
+++ b/partials/html/section/speaking.html
@@ -5,11 +5,14 @@
     {{> header-icon _title="SPEAKING" _section="speaking" _hdricon=(lookup . '_icon') }}
   {{/header-speaking}}
   {{#each r.speaking}}
+    {{#> body-speaking }}
     <div>
-    <h3><em>{{ title }}</em>, {{ from }} <span class="tenure">{{formatDate safe.date 'YYYY' }}</span></h3>
+    <h3><em>{{ title }}</em>, {{ from }}</h3>
+    <span class="tenure">{{formatDate safe.date 'YYYY' }}</span>
     {{{ summary }}}
     {{> highlights }}
     </div>
+    {{/body-speaking}}
   {{/each}}
 </section>
 {{/section}}
diff --git a/partials/html/section/testimonials.html b/partials/html/section/testimonials.html
index 8f3d12e..139be68 100644
--- a/partials/html/section/testimonials.html
+++ b/partials/html/section/testimonials.html
@@ -5,10 +5,12 @@
     {{> header-icon _title="TESTIMONIALS" _section="testimonials" _hdricon=(lookup . '_icon') }}
   {{/header-testimonials}}
   {{#each r.testimonials}}
+    {{#> body-testimonials }}
     <div>
     <h3><em>{{ name }}</em></h3>
     <p>{{{ quote }}}</p>
     </div>
+    {{/body-testimonials}}
   {{/each}}
 </section>
 {{/section}}
diff --git a/partials/html/section/writing.html b/partials/html/section/writing.html
index 8727d71..5fc702b 100644
--- a/partials/html/section/writing.html
+++ b/partials/html/section/writing.html
@@ -5,6 +5,7 @@
     {{> header-icon _title="WRITING" _section="writing" _hdricon=(lookup . '_icon') }}
   {{/header-writing}}
   {{#each r.writing }}
+    {{#> body-writing }}
     <div>
     <h3><em>{{#if url}}<a href="{{{ url }}}">{{{ title }}}</a>{{else}}{{{ title }}}{{/if}}</em>,
       {{ publisher.name }}</h3>
@@ -12,6 +13,7 @@
       {{{ summary }}}
       {{> highlights }}
     </div>
+    {{/body-writing}}
   {{/each}}
 </section>
 {{/section}}