diff --git a/src/backoffice/templates/badge_handout.html b/src/backoffice/templates/badge_handout.html
index b031eb29..d8e23223 100644
--- a/src/backoffice/templates/badge_handout.html
+++ b/src/backoffice/templates/badge_handout.html
@@ -21,21 +21,27 @@
     <table class="table table-hover">
       <thead>
       <tr>
-          <th>Ticket</th>
-          <th>User</th>
-          <th>Email</th>
-          <th>Name</th>
+          <th>Ticket UUID</th>
+          <th>Ticket Type</th>
+          <th>Ticket Order ID</th>
+          <th>Order User</th>
+          <th>Order Email</th>
+          <th>Ticket Name</th>
+          <th>Ticket Email</th>
           <th>Product</th>
        </tr>
       </thead>
       <tbody>
       {% for ticket in tickets %}
       <tr>
-          <td>{{ ticket.uuid }}</td>
+          <td><a href="/admin/tickets/shopticket/{{ ticket.uuid }}/change/">{{ ticket.uuid }}</a></td>
+          <td>{{ ticket.shortname }}</td>
+          <td><a href="/admin/shop/order/{{ ticket.order.id }}/change/">{{ ticket.order.id }}</a></td>
           <td>{{ ticket.order.user }}</td>
           <td>{{ ticket.order.user.email }}</td>
           <td>{{ ticket.name }}</td>
           <td>{{ ticket.email }}</td>
+          <td>{{ ticket.product }}</td>
       </tr>
       {% endfor %}
       </tbody>
diff --git a/src/backoffice/templates/ticket_checkin.html b/src/backoffice/templates/ticket_checkin.html
index bb677785..cb75cc59 100644
--- a/src/backoffice/templates/ticket_checkin.html
+++ b/src/backoffice/templates/ticket_checkin.html
@@ -21,21 +21,27 @@
     <table class="table table-hover">
       <thead>
       <tr>
-          <th>Ticket</th>
-          <th>User</th>
-          <th>Email</th>
-          <th>Name</th>
+          <th>Ticket UUID</th>
+          <th>Ticket Type</th>
+          <th>Order ID</th>
+          <th>Order User</th>
+          <th>Order Email</th>
+          <th>Ticket Name</th>
+          <th>Ticket Email</th>
           <th>Product</th>
        </tr>
       </thead>
       <tbody>
       {% for ticket in tickets %}
-      <p>{{ ticket }}
       <tr>
-          <td><a href="/admin/tickets/{{ ticket }}/{{ ticket.uuid }}/change/">{{ ticket }}</a></td>
+          <td><a href="/admin/tickets/shopticket/{{ ticket.uuid }}/change/">{{ ticket.uuid }}</a></td>
+          <td>{{ ticket.shortname }}</td>
+          <td><a href="/admin/shop/order/{{ ticket.order.id }}/change/">{{ ticket.order.id }}</a></td>
           <td>{{ ticket.order.user }}</td>
           <td>{{ ticket.order.user.email }}</td>
           <td>{{ ticket.name }}</td>
+          <td>{{ ticket.email }}</td>
+          <td>{{ ticket.product }}</td>
       </tr>
       {% endfor %}
       </tbody>
diff --git a/src/templates/base.html b/src/templates/base.html
index 4e66eb27..adb2d321 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -72,6 +72,9 @@
             </li>
             <li><a href="{% url 'contact' %}">Contact</a></li>
             <li><a href="{% url 'people' %}">People</a></li>
+            {% if user.is_authenticated and user.is_staff %}
+            <li><a href="{% url 'backoffice:index' %}">Backoffice</a></li>
+            {% endif %}
           </ul>
           <ul class="nav navbar-nav navbar-right">
             {% if user.is_authenticated %}