diff --git a/partials/awards.hbs b/partials/awards.hbs
index 2e322f4..1cd1255 100644
--- a/partials/awards.hbs
+++ b/partials/awards.hbs
@@ -11,13 +11,11 @@
                 <time datetime="{{.}}">{{formatDate .}}</time>
               {{/date}}
             </div>
-            <div class="spaced-list">
-              {{#awarder}}
-                <div>
-                  Awarded by <strong>{{.}}</strong>
-                </div>
-              {{/awarder}}
-            </div>
+            {{#awarder}}
+              <span>
+                Awarded by <strong>{{.}}</strong>
+              </span>
+            {{/awarder}}
           </header>
           {{#summary}}
             {{{markdown .}}}
diff --git a/partials/certificates.hbs b/partials/certificates.hbs
index 36728a7..ee1b01d 100644
--- a/partials/certificates.hbs
+++ b/partials/certificates.hbs
@@ -6,21 +6,16 @@
         <article>
           <header>
             <div class="spaced-list">
-              <h4>{{name}}</h4>
+              <h4>{{> link}}</h4>
               {{#date}}
                 <time datetime="{{.}}">{{formatDate .}}</time>
               {{/date}}
             </div>
-            <div class="spaced-list">
-              {{#issuer}}
-                <span>
-                  Issued by <strong>{{.}}</strong>
-                </span>
-              {{/issuer}}
-              {{#url}}
-                <a href="{{.}}">{{formatURL .}}</a>
-              {{/url}}
-            </div>
+            {{#issuer}}
+              <span>
+                Issued by <strong>{{.}}</strong>
+              </span>
+            {{/issuer}}
           </header>
         </article>
       {{/each}}
diff --git a/partials/education.hbs b/partials/education.hbs
index 7b53058..7a58bc2 100644
--- a/partials/education.hbs
+++ b/partials/education.hbs
@@ -6,20 +6,15 @@
         <article>
           <header>
             <div class="spaced-list">
-              <h4>{{institution}}</h4>
+              <h4>{{> link name=institution}}</h4>
               <span>
                 <time datetime="{{startDate}}">{{formatDate startDate}}</time> –
                 {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
               </span>
             </div>
-            <div class="spaced-list">
-              {{#area}}
-                <strong>{{.}}</strong>
-              {{/area}}
-              {{#url}}
-                <a href="{{.}}">{{formatURL .}}</a>
-              {{/url}}
-            </div>
+            {{#area}}
+              <strong>{{.}}</strong>
+            {{/area}}
           </header>
           {{#studyType}}
             {{{markdown .}}}
diff --git a/partials/link.hbs b/partials/link.hbs
new file mode 100644
index 0000000..b373510
--- /dev/null
+++ b/partials/link.hbs
@@ -0,0 +1 @@
+{{#if name}}{{#if url}}<a href="{{url}}">{{name}}</a>{{else}}{{name}}{{/if}}{{else}}{{#url}}<a href="{{.}}">{{formatURL .}}</a>{{/url}}{{/if}}
\ No newline at end of file
diff --git a/partials/projects.hbs b/partials/projects.hbs
index 745ab7a..3a2850c 100644
--- a/partials/projects.hbs
+++ b/partials/projects.hbs
@@ -6,25 +6,20 @@
         <article>
           <header>
             <div class="spaced-list">
-              <h4>{{name}}</h4>
+              <h4>{{> link}}</h4>
               <span>
                 <time datetime="{{startDate}}">{{formatDate startDate}}</time> –
                 {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
               </span>
             </div>
-            <div class="spaced-list">
-              <span>
-                {{#if roles}}
-                  <strong>{{join roles}}</strong>
-                {{/if}}
-                {{#entity}}
-                  at <strong>{{.}}</strong>
-                {{/entity}}
-              </span>
-              {{#url}}
-                <a href="{{.}}">{{formatURL .}}</a>
-              {{/url}}
-            </div>
+            <span>
+              {{#if roles}}
+                <strong>{{join roles}}</strong>
+              {{/if}}
+              {{#entity}}
+                at <strong>{{.}}</strong>
+              {{/entity}}
+            </span>
           </header>
           {{#description}}
             {{{markdown .}}}
diff --git a/partials/publications.hbs b/partials/publications.hbs
index f6f0c1f..8da32b6 100644
--- a/partials/publications.hbs
+++ b/partials/publications.hbs
@@ -6,21 +6,16 @@
         <article>
           <header>
             <div class="spaced-list">
-              <h4>{{name}}</h4>
+              <h4>{{> link}}</h4>
               {{#releaseDate}}
                 <time datetime="{{.}}">{{formatDate .}}</time>
               {{/releaseDate}}
             </div>
-            <div class="spaced-list">
-              {{#publisher}}
-                <span>
-                  Published by <strong>{{.}}</strong>
-                </span>
-              {{/publisher}}
-              {{#url}}
-                <a href="{{.}}">{{formatURL .}}</a>
-              {{/url}}
-            </div>
+            {{#publisher}}
+              <span>
+                Published by <strong>{{.}}</strong>
+              </span>
+            {{/publisher}}
           </header>
           {{#summary}}
             {{{markdown .}}}
diff --git a/partials/volunteer.hbs b/partials/volunteer.hbs
index 28c86cc..7ea437c 100644
--- a/partials/volunteer.hbs
+++ b/partials/volunteer.hbs
@@ -12,14 +12,7 @@
                 {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
               </span>
             </div>
-            <div class="spaced-list">
-              {{#organization}}
-                <strong>{{.}}</strong>
-              {{/organization}}
-              {{#url}}
-                <a href="{{.}}">{{formatURL .}}</a>
-              {{/url}}
-            </div>
+            <strong>{{> link name=organization}}</strong>
           </header>
           {{#summary}}
             {{{markdown .}}}
diff --git a/partials/work.hbs b/partials/work.hbs
index 0de7673..803893e 100644
--- a/partials/work.hbs
+++ b/partials/work.hbs
@@ -12,14 +12,7 @@
                 {{#if endDate}}<time datetime="{{endDate}}">{{formatDate endDate}}</time>{{else}}Present{{/if}}
               </span>
             </div>
-            <div class="spaced-list">
-              {{#name}}
-                <strong>{{.}}</strong>
-              {{/name}}
-              {{#url}}
-                <a href="{{.}}">{{formatURL .}}</a>
-              {{/url}}
-            </div>
+            <strong>{{> link}}</strong>
           </header>
           {{#summary}}
             {{{markdown .}}}
diff --git a/style.css b/style.css
index 7bde906..75a207e 100644
--- a/style.css
+++ b/style.css
@@ -194,7 +194,7 @@ blockquote > * + * {
   justify-content: space-between;
 }
 
-.spaced-list:first-child::before {
+.spaced-list::before {
   border-bottom: 1px solid var(--color-muted);
   content: '';
   flex-grow: 1;
diff --git a/tap-snapshots/test/render.js.test.cjs b/tap-snapshots/test/render.js.test.cjs
index beeb7b9..88a5ce6 100644
--- a/tap-snapshots/test/render.js.test.cjs
+++ b/tap-snapshots/test/render.js.test.cjs
@@ -210,7 +210,7 @@ blockquote > * + * {
   justify-content: space-between;
 }
 
-.spaced-list:first-child::before {
+.spaced-list::before {
   border-bottom: 1px solid var(--color-muted);
   content: '';
   flex-grow: 1;
@@ -318,10 +318,7 @@ blockquote > * + * {
                     <time datetime="2014-12-01">Dec 2014</time>
                   </span>
                 </div>
-                <div class="spaced-list">
-                    <strong>Pied Piper</strong>
-                    <a href="http://piedpiper.example.com">piedpiper.example.com</a>
-                </div>
+                <strong><a href="http://piedpiper.example.com">Pied Piper</a></strong>
               </header>
                 <p>Pied Piper is a multi-platform technology based on a proprietary universal compression algorithm that has consistently fielded high Weisman Scores™ that are not merely competitive, but approach the theoretical limit of lossless compression.</p>
                 <ul>
@@ -344,10 +341,7 @@ blockquote > * + * {
                     <time datetime="2013-01-01">Jan 2013</time>
                   </span>
                 </div>
-                <div class="spaced-list">
-                    <strong>CoderDojo</strong>
-                    <a href="http://coderdojo.example.com/">coderdojo.example.com</a>
-                </div>
+                <strong><a href="http://coderdojo.example.com/">CoderDojo</a></strong>
               </header>
                 <p>Global movement of free coding clubs for young people.</p>
                 <ul>
@@ -362,16 +356,13 @@ blockquote > * + * {
             <article>
               <header>
                 <div class="spaced-list">
-                  <h4>University of Oklahoma</h4>
+                  <h4><a href="https://www.ou.edu/">University of Oklahoma</a></h4>
                   <span>
                     <time datetime="2011-06-01">Jun 2011</time> –
                     <time datetime="2014-01-01">Jan 2014</time>
                   </span>
                 </div>
-                <div class="spaced-list">
-                    <strong>Information Technology</strong>
-                    <a href="https://www.ou.edu/">www.ou.edu</a>
-                </div>
+                  <strong>Information Technology</strong>
               </header>
                 <p>Bachelor</p>
                 <h5>Courses</h5>
@@ -388,19 +379,16 @@ blockquote > * + * {
             <article>
               <header>
                 <div class="spaced-list">
-                  <h4>Miss Direction</h4>
+                  <h4><a href="missdirection.example.com">Miss Direction</a></h4>
                   <span>
                     <time datetime="2016-08-24">Aug 2016</time> –
                     <time datetime="2016-08-24">Aug 2016</time>
                   </span>
                 </div>
-                <div class="spaced-list">
-                  <span>
-                      <strong>Team lead, Designer</strong>
-                      at <strong>Smoogle</strong>
-                  </span>
-                    <a href="missdirection.example.com">missdirection.example.com</a>
-                </div>
+                <span>
+                    <strong>Team lead, Designer</strong>
+                    at <strong>Smoogle</strong>
+                </span>
               </header>
                 <p>A mapping engine that misguides you</p>
                 <ul>
@@ -420,11 +408,9 @@ blockquote > * + * {
                   <h4>Digital Compression Pioneer Award</h4>
                     <time datetime="2014-11-01">Nov 2014</time>
                 </div>
-                <div class="spaced-list">
-                    <div>
-                      Awarded by <strong>Techcrunch</strong>
-                    </div>
-                </div>
+                  <span>
+                    Awarded by <strong>Techcrunch</strong>
+                  </span>
               </header>
                 <p>There is no spoon.</p>
             </article>
@@ -436,15 +422,12 @@ blockquote > * + * {
             <article>
               <header>
                 <div class="spaced-list">
-                  <h4>Video compression for 3d media</h4>
+                  <h4><a href="http://en.wikipedia.org/wiki/Silicon_Valley_(TV_series)">Video compression for 3d media</a></h4>
                     <time datetime="2014-10-01">Oct 2014</time>
                 </div>
-                <div class="spaced-list">
-                    <span>
-                      Published by <strong>Hooli</strong>
-                    </span>
-                    <a href="http://en.wikipedia.org/wiki/Silicon_Valley_(TV_series)">en.wikipedia.org/wiki/Silicon_Valley_(TV_series)</a>
-                </div>
+                  <span>
+                    Published by <strong>Hooli</strong>
+                  </span>
               </header>
                 <p>Innovative middle-out compression algorithm that changes the way we store data.</p>
             </article>