diff --git a/app/themes/default/work.html.twig b/app/themes/default/work.html.twig
index d7896f4..9e7896b 100644
--- a/app/themes/default/work.html.twig
+++ b/app/themes/default/work.html.twig
@@ -4,25 +4,26 @@
   <div class="resume-positions">
     {% for position in work %}
       <h3 class="company uk-panel-title uk-animation-slide-left">
-        {{ position.company }}
-        <small class="uk-align-right">
-          {{ position.startDate|date('M, Y') }} -
-          {% if position.endDate is not defined %}
-            Current
-          {% else %}
-            {{ position.endDate|date('M, Y') }}
-          {% endif %}
-
-          (~
-          {% if position.endDate is not defined %}
-            {{ position.startDate|date_diff }}
-          {% else %}
-            {{ position.startDate|date_diff(position.endDate) }}
-          {% endif %}
-          )
-        </small>
+        {{ position.company|raw }}
       </h3>
-      <h5>{{ position.position }}</h5>
+
+      <h5>{{ position.position }}<small class="uk-display-block">
+              {{ position.startDate|date('M, Y') }} -
+              {% if position.endDate is not defined %}
+                  Current
+              {% else %}
+                  {{ position.endDate|date('M, Y') }}
+              {% endif %}
+              (~
+              {% if position.endDate is not defined %}
+                  {{ position.startDate|date_diff }}
+              {% else %}
+                  {{ position.startDate|date_diff(position.endDate) }}
+              {% endif %}
+              )
+          </small>
+      </h5>
+
       <p class="summary uk-text-primary uk-text-large">
         {{ position.summary|raw }}
       </p>
diff --git a/data/resume.json b/data/resume.json
index 10a1754..b7c7b6a 100644
--- a/data/resume.json
+++ b/data/resume.json
@@ -39,7 +39,7 @@
   },
   "work": [
     {
-      "company": "Stanford University",
+      "company": "Stanford University<br />Department of Electrical Engineering",
       "position": "Developer / System Administrator",
       "website": "https://ee.stanford.edu",
       "startDate": "2007-05-27",