diff --git a/app/templates/supplier/_active_list.mustache b/app/templates/supplier/_active_list.mustache
new file mode 100644
index 00000000..974d3570
--- /dev/null
+++ b/app/templates/supplier/_active_list.mustache
@@ -0,0 +1,14 @@
+<tr class="list-row-{{id}}">
+  <td class="list-status">
+    <span id="list-needs-help-indicator-{{id}}" class="list-needs-help-indicator {{^needs_help}}hide{{/needs_help}}">?</span>
+    <span id="list-needs-payment-indicator-{{id}}" class="list-needs-payment-indicator {{^needs_payment}}hide{{/needs_payment}}">&euro;</span>
+  </td>
+  <td class="numeric table_number">{{table_number}}</td>
+  <td class="section_title">{{section_title}}</td>
+  <td class="currency total_list_amount">{{currency total_amount}}</td>
+  <td class="actions">
+    <button id="list-is-helped-button-{{id}}" class="btn btn-info {{^needs_help}}hide{{/needs_help}}" onclick="Qsupplier.mark_list_as_helped('{{id}}')" data-t="list.is_helped_button"></button>
+    <button class="btn btn-warning" onclick="Qsupplier.close_list('{{id}}')" data-t="list.close_list"></button>
+    <a href="/supplier/lists/{{id}}" class="btn"><span class="icon-list">&nbsp;</span></a>
+  </td>
+<tr>
diff --git a/app/templates/supplier/_active_order.mustache b/app/templates/supplier/_active_order.mustache
new file mode 100644
index 00000000..56c07d08
--- /dev/null
+++ b/app/templates/supplier/_active_order.mustache
@@ -0,0 +1,10 @@
+<tr class="order-row-{{id}} of-list-{{list_id}} {{state}}">
+  <td>{{display}}</td>
+  <td class="numeric table_number">{{table_number}}</td>
+  <td class="section_title">{{section_title}}</td>
+  <td class="currency">{{currency total_amount}}</td>
+  <td class="actions">
+    <button id="order-in-process-button-{{id}}" class="btn btn-success {{^can_process}}hide{{/can_process}}" onclick="Qsupplier.mark_order_in_process('{{id}}')" data-t="order.being_processed"></button>
+    <button class="btn btn-inverse" onclick="Qsupplier.mark_order_delivered('{{id}}')" data-t="order.being_served"></button>
+  </td>
+</tr>
diff --git a/app/templates/supplier/_alert.mustache b/app/templates/supplier/_alert.mustache
new file mode 100644
index 00000000..b078499a
--- /dev/null
+++ b/app/templates/supplier/_alert.mustache
@@ -0,0 +1,12 @@
+<div class="modal hide fade" role="dialog" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3>{{title}}</h3>
+  </div>
+  <div class="modal-body">
+    <p>{{message}}</p>
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn" data-dismiss="modal" aria-hidden="true">{{close}}</a>
+  </div>
+</div>
diff --git a/app/templates/supplier/_list_order.mustache b/app/templates/supplier/_list_order.mustache
new file mode 100644
index 00000000..d6c76b03
--- /dev/null
+++ b/app/templates/supplier/_list_order.mustache
@@ -0,0 +1,4 @@
+<tr class="order-row-{{id}} {{state}}">
+  <td>{{display}}</td>
+  <td class="currency">{{#currency}}{{total_amount}}{{/currency}}</td>
+</tr>
diff --git a/app/templates/user/_active_list_order.mustache b/app/templates/user/_active_list_order.mustache
new file mode 100644
index 00000000..d6c76b03
--- /dev/null
+++ b/app/templates/user/_active_list_order.mustache
@@ -0,0 +1,4 @@
+<tr class="order-row-{{id}} {{state}}">
+  <td>{{display}}</td>
+  <td class="currency">{{#currency}}{{total_amount}}{{/currency}}</td>
+</tr>
diff --git a/app/templates/user/_active_order.mustache b/app/templates/user/_active_order.mustache
new file mode 100644
index 00000000..b637fcd4
--- /dev/null
+++ b/app/templates/user/_active_order.mustache
@@ -0,0 +1,38 @@
+<table id="active-order-table" class="table">
+  <thead>
+    <tr>
+      <th data-t="models.product"></th>
+      <th>#</th>
+      <th class="currency" data-t="basket.total"></th>
+    </tr>
+  </thead>
+  <tbody>
+    {{#products}}
+    <tr>
+      <td>{{name}}</td>
+      <td>{{number}}</td>
+      <td class="currency">
+        {{#currency}}{{product_total}}{{/currency}}
+        <a class="product-order-remove-button" href=""><span class="fa fa-times fa-large"></span></a>
+      </td>
+    </tr>
+    {{/products}}
+  </tbody>
+  <tfoot>
+    <tr>
+      <td colspan="2">
+        Totaal
+      </td>
+      <td class="currency"><strong id="active-order-total">{{#currency}}{{total}}{{/currency}}</strong></td>
+    <tr>
+    <tr>
+      <td>
+        <button class="btn btn btn-warning hide" onClick="Quser.clear_selected_products()" data-t="selected_products.clear"></button>
+      </td>
+      <td></td>
+      <td style="text-align: right">
+        <button class="order-selected-products" onClick="Quser.order_selected_products()" data-t="selected_products.order"></button>
+      </td>
+    <tr>
+  </tfoot>
+</table>
diff --git a/app/templates/user/_alert.mustache b/app/templates/user/_alert.mustache
new file mode 100644
index 00000000..b078499a
--- /dev/null
+++ b/app/templates/user/_alert.mustache
@@ -0,0 +1,12 @@
+<div class="modal hide fade" role="dialog" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3>{{title}}</h3>
+  </div>
+  <div class="modal-body">
+    <p>{{message}}</p>
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn" data-dismiss="modal" aria-hidden="true">{{close}}</a>
+  </div>
+</div>
diff --git a/app/templates/user/_join_request.mustache b/app/templates/user/_join_request.mustache
new file mode 100644
index 00000000..29bbf187
--- /dev/null
+++ b/app/templates/user/_join_request.mustache
@@ -0,0 +1,13 @@
+<div class="modal hide fade" role="dialog" aria-hidden="true">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3>{{title}}</h3>
+  </div>
+  <div class="modal-body">
+    <p>{{message}}</p>
+  </div>
+  <div class="modal-footer">
+    <a href="#" class="btn reject-join-request-button" onclick="Quser.reject_join_request('{{requester_id}}')"  data-dismiss="modal" aria-hidden="true">{{reject}}</a>
+    <a href="#" class="btn btn-primary approve-join-request-button" onclick="Quser.approve_join_request('{{requester_id}}')"  data-dismiss="modal" aria-hidden="true">{{approve}}</a>
+  </div>
+</div>
diff --git a/app/templates/user/_list_history.mustache b/app/templates/user/_list_history.mustache
new file mode 100644
index 00000000..d1e2654c
--- /dev/null
+++ b/app/templates/user/_list_history.mustache
@@ -0,0 +1,3 @@
+<li>
+  <a href="#" onclick="redirect_to('history_list', {list_id: '{{id}}'})">{{display}}</a>
+</li>
diff --git a/app/templates/user/_products_category.mustache b/app/templates/user/_products_category.mustache
new file mode 100644
index 00000000..87543de1
--- /dev/null
+++ b/app/templates/user/_products_category.mustache
@@ -0,0 +1,7 @@
+<tr><td colspan="2"><h4>{{category}}</h4></td></tr>
+{{#products}}
+<tr>
+  <td>{{name}}</td>
+  <td>{{#currency}}{{price}}{{/currency}}</td>
+</tr>
+{{/products}}
diff --git a/app/templates/user/_products_category_for_order.mustache b/app/templates/user/_products_category_for_order.mustache
new file mode 100644
index 00000000..4729c5e2
--- /dev/null
+++ b/app/templates/user/_products_category_for_order.mustache
@@ -0,0 +1,15 @@
+<tr><td colspan="3"><h4>{{category}}</h4></td></tr>
+{{#products}}
+<tr>
+  <td>{{name}}</td>
+  <td class="order-count-cell">
+    <span class="btn btn-mini hide" onclick="Quser.lower_products_counter('{{_id}}')">-</span>
+    <span id="order-product-count-{{_id}}" class="order-product-count">1</span>
+    <span class="btn btn-mini hide" onclick="Quser.increment_products_counter('{{_id}}')">+</span>
+  </td>
+  <td style="text-align: right">
+    {{#currency}}{{price}}{{/currency}}
+    <button class="btn order-product-button order-product-{{_id}}" onclick="Quser.add_product_to_order('{{_id}}', this)">Add</button>
+  </td>
+</tr>
+{{/products}}