diff --git a/django/didgeridoo/webshop/templates/webshop/nav.html b/django/didgeridoo/webshop/templates/webshop/nav.html
index 8aa7f44..f65151f 100644
--- a/django/didgeridoo/webshop/templates/webshop/nav.html
+++ b/django/didgeridoo/webshop/templates/webshop/nav.html
@@ -6,26 +6,18 @@
         HOME
       </a>
       <ul class="nav navbar-nav">
-        <li><a href="{% url 'cart' %}">CART</a></li>
         {% if user.is_authenticated %}
-        <li>
-          <a href="{% url 'profile' %}">PROFILE</a>
-        </li>
-        <li>
-          <a href="{% url 'logout' %}">LOGOUT</a>
-        </li>
+        <li><a href="{% url 'cart' %}">CART</a></li>
+        <li><a href="{% url 'profile' %}">PROFILE</a></li>
+        <li><a href="{% url 'logout' %}">LOGOUT</a></li>
         {% else %}
-        <li>
-          <a href="{% url 'login' %}">LOGIN</a>
-        </li>
+        <li><a href="{% url 'login' %}">LOGIN</a></li>
         {% endif %}
         <li class="dropdown">
             {% if article_view %}
           <form id="currency" action="" method="POST" novalidate>
             {{ currencies_form.as_ul }}
-            <li>
-              <input type="submit" value="Select">
-            </li>
+            <li><input type="submit" value="Select"></li>
           {% csrf_token %}
           </form>
           {% endif %}
diff --git a/django/didgeridoo/webshop/views.py b/django/didgeridoo/webshop/views.py
index 8aea144..089d76f 100644
--- a/django/didgeridoo/webshop/views.py
+++ b/django/didgeridoo/webshop/views.py
@@ -251,7 +251,7 @@ def cart(request):
         articles_list = list(articles)
         for idx, article in enumerate(articles_list):
             article.price_in_chf = rate.exchange(
-                currency, article.price_in_chf)
+                currency, article.article.price_in_chf)
             articles_list[idx] = article
             currency_name = ExchangeRate_name.objects.get(id=currency)
             article.price_in_chf = rate.exchange(currency, article.price_in_chf)