diff --git a/bornhack/static_src/css/bornhack.css b/bornhack/static_src/css/bornhack.css
index d1ed79d3..2943fcfc 100644
--- a/bornhack/static_src/css/bornhack.css
+++ b/bornhack/static_src/css/bornhack.css
@@ -83,6 +83,11 @@ a, a:active, a:focus {
   color: rgb(255, 255, 255);
 }
 
+.btn-grey {
+  background-color: #777;
+  color: rgb(255, 255, 255);
+}
+
 #map {
   height: 500px;
 }
diff --git a/shop/templates/shop_base.html b/shop/templates/shop_base.html
index e9116971..bb2a7de3 100644
--- a/shop/templates/shop_base.html
+++ b/shop/templates/shop_base.html
@@ -2,6 +2,22 @@
 
 {% block content %}
 
+
+<div class="row">
+  <div class="col-md-6">
+  {% block shop_left_top %}
+  {% endblock %}
+  </div>
+  <div class="col-md-6">
+    <div class="pull-right">
+      {% if user.is_authenticated and user.orders.exists %}
+      <a href="{% url 'shop:order_list' %}" class="btn btn-grey">Previous orders</a>
+      {% endif %}
+    </div>
+  </div>
+</div>
+
+
 {% block shop_content %}
 {% endblock %}
 
diff --git a/shop/templates/shop_index.html b/shop/templates/shop_index.html
index d5053847..894cc038 100644
--- a/shop/templates/shop_index.html
+++ b/shop/templates/shop_index.html
@@ -2,22 +2,19 @@
 {% load bootstrap3 %}
 {% load shop_tags %}
 
-{% block shop_content %}
-
-<div class="row">
-  <div class="col-md-12">
+{% block shop_left_top %}
   <p>
     Categories:
     {% for category in categories %}
     <a href="{% url 'shop:index' %}?category={{category.slug}}"
        class="label label-{% if category.slug == current_category %}primary{% else %}default{% endif %}">
-        {{category}}
+      {{category}}
     </a>&nbsp;
-    {% endfor %}</p>
-    <p><i>Looking for your <a href="{% url 'shop:order_list' %}">previous orders</a>?</i></p>
-  </div>
-</div>
+    {% endfor %}
+  </p>
+{% endblock %}
 
+{% block shop_content %}
 <hr />
 
 <div class="row">