diff --git a/combo/apps/lingo/templates/lingo/combo/basket.html b/combo/apps/lingo/templates/lingo/combo/basket.html
index 12a8dfe1..2eb11e8f 100644
--- a/combo/apps/lingo/templates/lingo/combo/basket.html
+++ b/combo/apps/lingo/templates/lingo/combo/basket.html
@@ -2,33 +2,39 @@
 {% block cell-content %}
 {% if regies %}
 <h2>{% trans "Basket" %}</h2>
+<div class="lingo-basket-cell--content">
 {% for regie_info in regies %}
-{% if regies|length != 1 %}<h3 class="regie-name">{{regie_info.regie.label}}</h3>{% endif %}
-<ul class="payment-items">
+<div class="lingo-basket-cell--regie">
+{% if regies|length != 1 %}<h3 class="lingo-basket-cell--regie-name">{{regie_info.regie.label}}</h3>{% endif %}
+<ul class="lingo-basket-cell--list">
   {% for item in regie_info.items %}
-  <li><a {% if item.source_url %}href="{{ item.source_url }}{% endif %}">{{ item.subject }}</a>: {{ item.amount }} €
-          {% if item.user_cancellable %}
-          <a rel="popup" href="{% url 'lingo-cancel-item' pk=item.id %}">({% trans 'remove' %})</a>
-          {% endif %}
-          {% if regie_info.regie.can_pay_only_one_basket_item %}
-          <a id="{{ item.pk }}" class="button individual-item" href="{{ item.payment_url }}?next_url={{ cell.page.get_online_url }}">{% trans "Pay" %}</a>
-          {% endif %}
+  <li class="lingo-basket-cell--item">
+    <a class="lingo-basket-cell--item-label" {% if item.source_url %}href="{{ item.source_url }}{% endif %}">{{ item.subject }}</a>
+    <span class="lingo-basket-cell--item-price">{{ item.amount }} €</span>
+    <span class="lingo-basket-cell--item-actions">
+      {% if regie_info.regie.can_pay_only_one_basket_item %}
+      <a id="{{ item.pk }}" class="lingo-basket-cell--item-pay" href="{{ item.payment_url }}?next_url={{ cell.page.get_online_url }}">{% trans "Pay" %}</a>
+      {% endif %}
+      {% if item.user_cancellable %}
+      <a class="lingo-basket-cell--item-remove" role="button" rel="popup" href="{% url 'lingo-cancel-item' pk=item.id %}">{% trans 'remove' %}</a>
+      {% endif %}
+    </span>
   </li>
   {% endfor %}
-  {% if not regie_info.regie.can_pay_only_one_basket_item %}
-  <li><strong>{% trans "Total:" %}</strong> {{ regie_info.total }} €</li>
-  {% endif %}
 </ul>
+</div>
 
 {% if not regie_info.regie.can_pay_only_one_basket_item %}
 <form action="{% url 'lingo-pay' %}" method="POST">
 {% csrf_token %}
+<p class="lingo-basket-cell--total"><strong>{% trans "Total:" %}</strong> {{ regie_info.total }} €</p>
 <input type="hidden" name="next_url" value="{{ cell.page.get_online_url }}" />
 <input type="hidden" name="regie" value="{{regie_info.regie.id}}" />
-<button>{% trans "Pay" %}</button>
+<button class="lingo-basket-cell--pay">{% trans "Pay" %}</button>
 </form>
 {% endif %}
 
 {% endfor %}
 {% endif %}
+</div>
 {% endblock %}