diff --git a/nummi/transaction/models.py b/nummi/transaction/models.py
index 0fb8dd8..adc78c0 100644
--- a/nummi/transaction/models.py
+++ b/nummi/transaction/models.py
@@ -69,10 +69,6 @@ class Transaction(UserModel):
         if self.statement:
             return self.statement.account
 
-    @property
-    def has_invoice(self):
-        return self.invoices.count() > 0
-
     class Meta:
         ordering = ["-date", "statement"]
         verbose_name = _("Transaction")
diff --git a/nummi/transaction/templates/transaction/invoice_table.html b/nummi/transaction/templates/transaction/invoice_table.html
index f67b659..7b5919b 100644
--- a/nummi/transaction/templates/transaction/invoice_table.html
+++ b/nummi/transaction/templates/transaction/invoice_table.html
@@ -1,8 +1,7 @@
-{% load main_extras %}
-{% load i18n %}
+{% load i18n main_extras %}
 <div id="invoices">
   <ul class="invoices">
-    {% for invoice in transaction.invoices %}
+    {% for invoice in invoices %}
       <li>
         <a class="title" href="{{ invoice.file.url }}">{{ "file"|remix }}{{ invoice.name }} [{{ invoice.file|extension }}]</a>
         <a href="{{ invoice.get_absolute_url }}">{{ "file-edit"|remix }}{% translate "Edit" %}</a>
diff --git a/nummi/transaction/templates/transaction/transaction_detail.html b/nummi/transaction/templates/transaction/transaction_detail.html
index a879a3e..4cfd068 100644
--- a/nummi/transaction/templates/transaction/transaction_detail.html
+++ b/nummi/transaction/templates/transaction/transaction_detail.html
@@ -1,16 +1,16 @@
 {% extends "main/form/base.html" %}
 {% load i18n %}
-{% load main_extras %}
+{% load main_extras transaction_extras %}
 {% block title %}
   {{ transaction }}
   – Nummi
-{% endblock %}
+{% endblock title %}
 {% block link %}
   {{ block.super }}
   {% css "main/css/form.css" %}
   {% css "main/css/table.css" %}
   {% css "main/css/plot.css" %}
-{% endblock %}
+{% endblock link %}
 {% block body %}
   <h2>{{ transaction }}</h2>
   <section class="transaction-details">
@@ -43,6 +43,6 @@
   </section>
   <section>
     <h3>{% translate "Invoices" %}</h3>
-    {% include "transaction/invoice_table.html" %}
+    {% invoice_table transaction %}
   </section>
-{% endblock %}
+{% endblock body %}
diff --git a/nummi/transaction/templates/transaction/transaction_table.html b/nummi/transaction/templates/transaction/transaction_table.html
index 396c511..6e34f14 100644
--- a/nummi/transaction/templates/transaction/transaction_table.html
+++ b/nummi/transaction/templates/transaction/transaction_table.html
@@ -39,7 +39,7 @@
       {% for trans in transactions %}
         <tr>
           <td class="c">
-            {% for invoice in trans.invoices %}
+            {% for invoice in trans.invoice_set.all %}
               <a class="i" href="{{ invoice.file.url }}">{{ "attachment"|remix }}</a>
             {% endfor %}
           </td>
diff --git a/nummi/transaction/templatetags/transaction_extras.py b/nummi/transaction/templatetags/transaction_extras.py
index b614674..7817cfb 100644
--- a/nummi/transaction/templatetags/transaction_extras.py
+++ b/nummi/transaction/templatetags/transaction_extras.py
@@ -22,6 +22,14 @@ def transaction_table(transactions, **kwargs):
     }
 
 
+@register.inclusion_tag("transaction/invoice_table.html")
+def invoice_table(transaction, **kwargs):
+    return kwargs | {
+        "transaction": transaction,
+        "invoices": transaction.invoice_set.all(),
+    }
+
+
 @register.simple_tag(takes_context=True)
 def month_url(context, month, cls="", fmt="Y-m"):
     url_name, url_params = ac_url(