diff --git a/app/Resources/assets/style/colors.scss b/app/Resources/assets/style/colors.scss
index a04f81c..dd0bd5e 100644
--- a/app/Resources/assets/style/colors.scss
+++ b/app/Resources/assets/style/colors.scss
@@ -146,4 +146,10 @@ $colors: (
   .text.color-#{$number} {
       color: $color;
   }
+
+  .segment.color-#{$number} {
+    padding-left: 0.7em !important;
+    margin-left: -1em !important;
+    border-left: $color 0.3em solid !important;
+  }
 }
\ No newline at end of file
diff --git a/app/Resources/views/set/tabs/colors.html.twig b/app/Resources/views/set/tabs/colors.html.twig
index 6a56b4a..5904eec 100644
--- a/app/Resources/views/set/tabs/colors.html.twig
+++ b/app/Resources/views/set/tabs/colors.html.twig
@@ -8,16 +8,16 @@
         {% endfor %}
     {% endfor %}
 
-    <div class="ui segment clearing noborder vertical">
+    <div class="ui segment clearing basic vertical">
         <a class="ui primary right floated button" href="{{ path('set_zip', {id: set.id, sorted: true }) }}" download><i class="download icon"></i> {{ 'set.download.multicolor.button' | trans}}</a>
     </div>
-    
+
     {% if colors|length > 0 %}
-        <div class="ui segment vertical noborder">
-            <h3 class="ui horizontal divider header">Models</h3>
+        <div class="ui segment vertical basic">
+            <h2 class="ui dividing header">{{ 'set.inventory.models' | trans }}</h2>
             {% for color in colors %}
-                <div class="ui segment vertical noborder">
-                    <h5 class="ui dividing header text color-{{ color['color'].id }}">
+                <div class="ui segment vertical basic side color-{{ color['color'].id }}">
+                    <h5 class="ui header">
                         {{ color['color'].name }} ({{ color['quantity'] }})
                     </h5>
                     <div class="ui grid doubling ten column row parts">
@@ -31,8 +31,8 @@
     {% endif %}
 
     {% if missing|length > 0 %}
-        <div class="ui segment vertical noborder">
-            <h3 class="ui horizontal divider header">Missing</h3>
+        <div class="ui vertical segment basic">
+            <h2 class="ui dividing header">{{ 'set.inventory.parts' | trans }}</h2>
             <div class="ui grid doubling ten column row parts">
                 {% for part in missing %}
                     {{ blocks.part(part['part'],part['quantity']) }}
diff --git a/app/Resources/views/set/tabs/inventory.html.twig b/app/Resources/views/set/tabs/inventory.html.twig
index e31cec5..7fb0372 100644
--- a/app/Resources/views/set/tabs/inventory.html.twig
+++ b/app/Resources/views/set/tabs/inventory.html.twig
@@ -3,44 +3,44 @@
 
 {% block content %}
     <div class="ui segment vertical">
-        {% for label, flashes in app.session.flashbag.all %}
-            {% for flash in flashes %}
-                {{ elements.flash(label,flash) }}
-            {% endfor %}
+    {% for label, flashes in app.session.flashbag.all %}
+        {% for flash in flashes %}
+            {{ elements.flash(label,flash) }}
         {% endfor %}
+    {% endfor %}
 
-        {% if inventorySets %}
-            <h3 class="ui horizontal divider header">Sets</h3>
-            <div class="ui eight column doubling grid sets">
-                {% for inventorySet in inventorySets %}
-                    {{ blocks.set(inventorySet.set, inventorySet.quantity) }}
-                {% endfor %}
-            </div>
-        {% else %}
-            {% if missingCount > 0 %}
-                <div class="ui warning icon message">
-                    <i class="warning icon"></i>
-                    <div class="content">
-                        <div class="header">
-                            {{ 'set.download.warning.title' | trans }}
-                        </div>
-                        <p> {{ 'set.download.warning.text' | trans({'%percent%':((1 - missingCount/partCount)*100)|number_format(2, '.', ','), '%total%':partCount, '%missing%': missingCount, '%unique%': missing|length}) | raw | nl2br }}</p>
+    {% if inventorySets %}
+        <h3 class="ui horizontal divider header">Sets</h3>
+        <div class="ui eight column doubling grid sets">
+            {% for inventorySet in inventorySets %}
+                {{ blocks.set(inventorySet.set, inventorySet.quantity) }}
+            {% endfor %}
+        </div>
+    {% else %}
+        {% if missingCount > 0 %}
+            <div class="ui warning icon message">
+                <i class="warning icon"></i>
+                <div class="content">
+                    <div class="header">
+                        {{ 'set.download.warning.title' | trans }}
                     </div>
+                    <p> {{ 'set.download.warning.text' | trans({'%percent%':((1 - missingCount/partCount)*100)|number_format(2, '.', ','), '%total%':partCount, '%missing%': missingCount, '%unique%': missing|length}) | raw | nl2br }}</p>
                 </div>
-            {% endif %}
-
-            <div class="ui top attached tabular menu submenu">
-                <a class="ui item {% if not app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/unicolor"><i class="grid layout icon"></i> Uni-Color</a>
-                <a class="ui item {% if app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/multicolor"><i class="list layout icon"></i> Multi-Color</a>
-            </div>
-
-            <div class="ui bottom attached tab {% if not app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/unicolor">
-                {{ render(path('set_models', {id: set.id})) }}
-            </div>
-            <div class="ui bottom attached tab {% if app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/multicolor">
-                {{ render(path('set_colors', {id: set.id})) }}
             </div>
         {% endif %}
+
+        <div class="ui top attached tabular menu submenu">
+            <a class="ui item {% if not app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/unicolor"><i class="grid layout icon"></i> Uni-Color</a>
+            <a class="ui item {% if app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/multicolor"><i class="list layout icon"></i> Multi-Color</a>
+        </div>
+
+        <div class="ui bottom attached tab {% if not app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/unicolor">
+            {{ render(path('set_models', {id: set.id})) }}
+        </div>
+        <div class="ui bottom attached tab {% if app.session.get('multicolor') %}active{%  endif %}" data-tab="inventory/multicolor">
+            {{ render(path('set_colors', {id: set.id})) }}
+        </div>
+    {% endif %}
     </div>
     <div class="ui segment vertical">
         <p class="ui text right">{{ 'set.rebrickable.credit' | trans | raw }}</p>
diff --git a/app/Resources/views/set/tabs/models.html.twig b/app/Resources/views/set/tabs/models.html.twig
index 1ec9b09..a543205 100644
--- a/app/Resources/views/set/tabs/models.html.twig
+++ b/app/Resources/views/set/tabs/models.html.twig
@@ -14,7 +14,7 @@
 
     {% if models|length > 0 %}
         <div class="ui segment vertical basic">
-            <h3 class="ui horizontal divider header">Models</h3>
+            <h2 class="ui dividing header">{{ 'set.inventory.models' | trans }}</h2>
             <div class="ui grid doubling ten column row parts">
                 {% for model in models %}
                     {{ blocks.model(model['model'],model['quantity']) }}
@@ -24,7 +24,7 @@
     {% endif %}
     {% if missing|length > 0 %}
         <div class="ui segment vertical basic">
-            <h3 class="ui horizontal divider header">Missing</h3>
+            <h2 class="ui dividing header">{{ 'set.inventory.parts' | trans }}</h2>
             <div class="ui grid doubling ten column row parts">
                 {% for part in missing %}
                     {{ blocks.part(part['part'],part['quantity']) }}
diff --git a/src/AppBundle/Entity/LDraw/Model.php b/src/AppBundle/Entity/LDraw/Model.php
index 0bd323c..3623892 100644
--- a/src/AppBundle/Entity/LDraw/Model.php
+++ b/src/AppBundle/Entity/LDraw/Model.php
@@ -27,7 +27,7 @@ class Model
     /**
      * @var Category
      *
-     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\LDraw\Category", inversedBy="models", cascade={"persist"})
+     * @ORM\ManyToOne(targetEntity="AppBundle\Entity\LDraw\Category", inversedBy="models", fetch="EAGER", cascade={"persist"})
      */
     private $category;