diff --git a/app/Resources/translations/messages.en.yml b/app/Resources/translations/messages.en.yml
index 4608f11..0bcde23 100644
--- a/app/Resources/translations/messages.en.yml
+++ b/app/Resources/translations/messages.en.yml
@@ -97,4 +97,34 @@ view.all:
 
 flash:
   warning.title: Warning
-  error.title: Error
\ No newline at end of file
+  error.title: Error
+
+empty:
+  description:
+    title: No description
+    message: Sorry, no desctiption found on Brickset
+  instructions:
+    title: No instructions
+    message: Sorry, no instructions found on Brickset
+  images:
+      title: No images
+      message: Sorry, no images found on Brickset
+  reviews:
+        title: No reviews
+        message: Sorry, no reviews found on Brickset
+  models:
+  search.title: No results found for your search criteria
+
+page.error:
+  title:
+  large:
+  text:
+
+part:
+  id: ID
+  name: Name
+  category: Category
+  model: Model
+  alternates: Alternate parts
+  molds: Molds of part
+  prints: Prints
diff --git a/app/Resources/views/brickset/description.html.twig b/app/Resources/views/brickset/description.html.twig
index c39a774..71efc07 100644
--- a/app/Resources/views/brickset/description.html.twig
+++ b/app/Resources/views/brickset/description.html.twig
@@ -16,6 +16,6 @@
             <p class="ui text right">{{ 'set.brickset.credit' | trans | raw }}</p>
         </div>
     {% else %}
-        {{ blocks.empty('empty.description'|trans) }}
+        {{ blocks.empty('empty.description.title'|trans, 'empty.description.message'|trans) }}
     {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/brickset/images.html.twig b/app/Resources/views/brickset/images.html.twig
index 34fe58b..fe543b2 100644
--- a/app/Resources/views/brickset/images.html.twig
+++ b/app/Resources/views/brickset/images.html.twig
@@ -24,6 +24,6 @@
             <p class="ui text right">{{ 'set.brickset.credit' | trans | raw }}</p>
         </div>
     {% else %}
-        {{ blocks.empty('empty.images') }}
+        {{ blocks.empty('empty.images.title'|trans, 'empty.images.message'|trans) }}
     {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/brickset/instructions.html.twig b/app/Resources/views/brickset/instructions.html.twig
index 45ddb14..1f78198 100644
--- a/app/Resources/views/brickset/instructions.html.twig
+++ b/app/Resources/views/brickset/instructions.html.twig
@@ -35,6 +35,6 @@
             <p class="ui text right">{{ 'set.brickset.credit' | trans | raw }}</p>
         </div>
     {% else %}
-        {{ blocks.empty('empty.instructions') }}
+        {{ blocks.empty('empty.instructions.title'|trans, 'empty.instructions.message'|trans) }}
     {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/brickset/reviews.html.twig b/app/Resources/views/brickset/reviews.html.twig
index 60edf13..bfc6a57 100644
--- a/app/Resources/views/brickset/reviews.html.twig
+++ b/app/Resources/views/brickset/reviews.html.twig
@@ -72,6 +72,6 @@
             <p class="ui text right">{{ 'set.brickset.credit' | trans | raw }}</p>
         </div>
     {% else %}
-        {{ blocks.empty('empty.reviews') }}
+        {{ blocks.empty('empty.reviews.title'|trans, 'empty.reviews.message'|trans) }}
     {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/app/Resources/views/macros/blocks.html.twig b/app/Resources/views/macros/blocks.html.twig
index 06e3111..cd6e3de 100644
--- a/app/Resources/views/macros/blocks.html.twig
+++ b/app/Resources/views/macros/blocks.html.twig
@@ -80,18 +80,24 @@
                 </div>
             </div>
             {% if quantity %}
-            <div class="extra content">
-                <div class="right floated">{{ quantity }}x</div>
-            </div>
+                <div class="extra content">
+                    <div class="right floated">{{ quantity }}x</div>
+                </div>
             {% endif %}
         </div>
     </a>
 {% endmacro %}
 
-{% macro empty(message) %}
-    <div class="ui center aligned icon header empty">
-        <p><i class="circular frown icon"></i>{{ message }}</p>
-    </div>
+{% macro empty(title, message = null) %}
+    <h3 class="ui center aligned icon header empty">
+        <i class="circular frown icon"></i>
+        <div class="content">
+            {{ title }}
+            {% if message %}
+                <div class="sub header">{{ message }}</div>
+            {% endif %}
+        </div>
+    </h3>
 {% endmacro %}
 
 {% macro ccal2_license(title,author) %}
diff --git a/app/Resources/views/model/index.html.twig b/app/Resources/views/model/index.html.twig
index a74a840..034b0ed 100644
--- a/app/Resources/views/model/index.html.twig
+++ b/app/Resources/views/model/index.html.twig
@@ -37,7 +37,7 @@
                         {% for model in models %}
                             {{ blocks.model(model) }}
                         {% else %}
-                            {{ blocks.empty('empty.models') }}
+                            {{ blocks.empty('empty.search.title' | trans )}}
                         {% endfor %}
                     </div>
                 </div>
diff --git a/app/Resources/views/set/index.html.twig b/app/Resources/views/set/index.html.twig
index 191c027..a40811b 100644
--- a/app/Resources/views/set/index.html.twig
+++ b/app/Resources/views/set/index.html.twig
@@ -47,7 +47,7 @@
                         {% for set in sets %}
                             {{ blocks.set(set) }}
                         {% else %}
-                            {{ blocks.empty('empty.sets') }}
+                            {{ blocks.empty('empty.search.title' | trans ) }}
                         {% endfor %}
                     </div>
                 </div>