diff --git a/components/volunteer.js b/components/volunteer.js
index e08bb2d..f77bde4 100644
--- a/components/volunteer.js
+++ b/components/volunteer.js
@@ -11,9 +11,9 @@ export default function Volunteer(volunteer = []) {
         ${volunteer.map(({ highlights = [], organization, position, startDate, endDate, summary, url }) => html`
           <article>
             <header>
-              <h4>${position}</h4>
+              <h4>${Link(url, organization)}</h4>
               <div class="meta">
-                <strong>${Link(url, organization)}</strong>
+                <strong>${position}</strong>
                 <div>${Duration(startDate, endDate)}</div>
               </div>
             </header>
diff --git a/components/work.js b/components/work.js
index f3fcc9c..3197a70 100644
--- a/components/work.js
+++ b/components/work.js
@@ -11,11 +11,11 @@ export default function Work(work = []) {
         ${work.map(({ description, highlights = [], location, name, position, startDate, endDate, summary, url }) => html`
           <article>
             <header>
-              <h4>${position}</h4>
+              <h4>${Link(url, name)}</h4>
               <div class="meta">
                 <div>
-                  <strong>${Link(url, name)}</strong>
-                  ${description && html`<span class="bullet-item">${description}</span>`}
+                  ${description && html`<div>${description}</div>`}
+                  <strong>${position}</strong>
                 </div>
                 <div>${Duration(startDate, endDate)}</div>
                 ${location && html`<div>${location}</div>`}
diff --git a/test/__snapshots__/index.test.js.snap b/test/__snapshots__/index.test.js.snap
index eb990b0..4c89f60 100644
--- a/test/__snapshots__/index.test.js.snap
+++ b/test/__snapshots__/index.test.js.snap
@@ -70,11 +70,11 @@ exports[`renders a resume 1`] = `
         
           <article>
             <header>
-              <h4>CEO/President</h4>
+              <h4><a href=\\"http://piedpiper.example.com\\">Pied Piper</a></h4>
               <div class=\\"meta\\">
                 <div>
-                  <strong><a href=\\"http://piedpiper.example.com\\">Pied Piper</a></strong>
-                  <span class=\\"bullet-item\\">Awesome compression company</span>
+                  <div>Awesome compression company</div>
+                  <strong>CEO/President</strong>
                 </div>
                 <div><time datetime=\\"2013-12-01\\">Dec 2013</time> – <time datetime=\\"2014-12-01\\">Dec 2014</time></div>
                 <div>Palo Alto, CA</div>
@@ -98,9 +98,9 @@ exports[`renders a resume 1`] = `
         
           <article>
             <header>
-              <h4>Teacher</h4>
+              <h4><a href=\\"http://coderdojo.example.com/\\">CoderDojo</a></h4>
               <div class=\\"meta\\">
-                <strong><a href=\\"http://coderdojo.example.com/\\">CoderDojo</a></strong>
+                <strong>Teacher</strong>
                 <div><time datetime=\\"2012-01-01\\">Jan 2012</time> – <time datetime=\\"2013-01-01\\">Jan 2013</time></div>
               </div>
             </header>