diff --git a/assets/sass/base/_layout.sass b/assets/sass/base/_layout.sass
index 261f1c43..27fca86d 100644
--- a/assets/sass/base/_layout.sass
+++ b/assets/sass/base/_layout.sass
@@ -3,3 +3,6 @@
 
 .is-half
     width: 50%
+
+.flex
+    flex: 1
diff --git a/assets/sass/components/_page-experience.sass b/assets/sass/components/_page-experience.sass
index 0b10d4c2..2811ed77 100644
--- a/assets/sass/components/_page-experience.sass
+++ b/assets/sass/components/_page-experience.sass
@@ -1,28 +1,25 @@
-.experience
+.experience-item
     margin-bottom: $padding-large-vertical * 3
     +clearfix
 
-    .inner
-        flex: 1
+.experience-item-website
+    display: inline-block
+    margin-bottom: 2px
 
-    &__website
-        display: inline-block
-        margin-bottom: 2px
+.experience-item-role
+    color: $gray-light
+    margin-bottom: .625rem
 
-    &__role
-        color: $gray-light
-        margin-bottom: .625rem
-
-    &__logo
-        margin-left: 1.5em
-        margin-top: 25px
-        max-width: 25%
-        +desktop
-            max-width: 15%
+.experience-item-logo
+    margin-left: 1.5em
+    margin-top: 25px
+    max-width: 25%
+    +desktop
+        max-width: 15%
 
     img
         height: auto
         width: 100%
 
-    p:last-of-type
-        margin-bottom: 0
+.experience-item-description p:last-of-type
+    margin-bottom: 0
diff --git a/source/_partials/experience/description.twig b/source/_partials/experience/description.twig
index 30459c7a..044a0e95 100644
--- a/source/_partials/experience/description.twig
+++ b/source/_partials/experience/description.twig
@@ -1,3 +1,5 @@
-<div class="experience__description">
-    {{ experience.description|markdown }}
-</div>
+{% if experience.description %}
+    <div class="experience-item-description">
+        {{ experience.description|markdown }}
+    </div>
+{% endif %}
diff --git a/source/_partials/experience/item.twig b/source/_partials/experience/item.twig
index 51b6fbdf..71f5d0a6 100644
--- a/source/_partials/experience/item.twig
+++ b/source/_partials/experience/item.twig
@@ -1,12 +1,11 @@
 {% set classes = [
-    'experience',
+    'experience-item',
     'is-flex',
     company.logo ? 'has-logo',
-    experience.featured ? 'is-featured',
 ] %}
 
-<div class="{{ classes|sort|join(' ') }}">
-    <div class="inner">
+<div class="{{ classes|join(' ')|trim }}">
+    <div class="experience-item-inner flex">
         <h2>{{ company.name }}</h2>
 
         {{ include('experience/website') }}
diff --git a/source/_partials/experience/logo.twig b/source/_partials/experience/logo.twig
index d6a0efa7..07f058c7 100644
--- a/source/_partials/experience/logo.twig
+++ b/source/_partials/experience/logo.twig
@@ -1,5 +1,5 @@
 {% if company.logo %}
-    <div class="experience__logo">
+    <div class="experience-item-logo">
         <img src="{{ site.images_url }}/assets/images/experience/{{ company.logo }}" alt="{{ company.name }} logo">
     </div>
 {% endif %}
diff --git a/source/_partials/experience/role.twig b/source/_partials/experience/role.twig
index 6f0f2b99..7a25ae65 100644
--- a/source/_partials/experience/role.twig
+++ b/source/_partials/experience/role.twig
@@ -1,8 +1,4 @@
-<div class="experience__role">
-    {% spaceless %}
-        {{ experience.role ~ ' from ' ~ experience.start ~ ' to ' ~ experience.end|default('Present') }}
-        {% if experience.location %}
-            ({{ experience.location }})
-        {% endif %}
-    {% endspaceless %}.
+<div class="experience-item-role">
+    {{- experience.role ~ ' from ' ~ experience.start ~ ' to ' ~ experience.end|default('Present') -}}
+    {%- if experience.location %} ({{ experience.location }}){% endif %}.
 </div>
diff --git a/source/_partials/experience/website.twig b/source/_partials/experience/website.twig
index f674e96c..676bad40 100644
--- a/source/_partials/experience/website.twig
+++ b/source/_partials/experience/website.twig
@@ -1,5 +1,5 @@
-{% if company.url %}
-    <a href="{{ company.url }}" class="experience__website">
-        {{ company.url }}
+{% if company.url -%}
+    <a class="experience-item-website" href="{{ company.url }}">
+        {{- company.url -}}
     </a>
-{% endif %}
+{%- endif %}