diff --git a/src/Siwapp/InvoiceBundle/Controller/DefaultController.php b/src/Siwapp/InvoiceBundle/Controller/DefaultController.php
index c12d654..766f6df 100644
--- a/src/Siwapp/InvoiceBundle/Controller/DefaultController.php
+++ b/src/Siwapp/InvoiceBundle/Controller/DefaultController.php
@@ -136,7 +136,10 @@ public function deleteAction($id)
     public function paymentsAction($invoiceId)
     {
         // Return all payments
-        return array('invoiceId' => $invoiceId);
+        $em = $this->getDoctrine()->getEntityManager();
+        $entities = $em->getRepository('SiwappInvoiceBundle:Payment')->findBy(array('invoice' => $invoiceId));
+		
+        return array('entities' => $entities, 'invoiceId' => $invoiceId);
     }
     
     /**
diff --git a/src/Siwapp/InvoiceBundle/Resources/views/Partials/payments.html.twig b/src/Siwapp/InvoiceBundle/Resources/views/Partials/payments.html.twig
index fd6ee8a..c2fe5b8 100644
--- a/src/Siwapp/InvoiceBundle/Resources/views/Partials/payments.html.twig
+++ b/src/Siwapp/InvoiceBundle/Resources/views/Partials/payments.html.twig
@@ -5,9 +5,55 @@
   <div class="inner" style="width:auto !important;">
     <h3 class="title">{% trans %}Payments{% endtrans %}</h3>
     <div class="content">
-      {# AJAX zone #}
-      {% include "SiwappInvoiceBundle:Partials:payments_form.html.twig" %}
-      {# AJAX zone #}
+	  <form action="{{ path('invoice_payment_add', { 'invoiceId': invoiceId }) }}" method="post">
+	    <table class="condensed-table">
+	      <thead>
+	        <tr>
+	          <th>
+	            <input type="checkbox" name="all" />
+	          </th>
+	          <th class="date">
+	            {% trans %}Date{% endtrans %}
+	          </th>
+	          <th>
+	            {% trans %}Description{% endtrans %}
+	          </th>
+	          <th class="currency">
+	            {% trans %}Amount{% endtrans %}
+	          </th>
+	        </tr>
+	      </thead>
+	      <tbody>
+	  	  {% for entity in entities %}
+	        <tr>
+	         	<td>
+	            <input type="checkbox" name="id[]" value="{{ entity.id }}" />
+	          </td>
+	          <td class="date">{{ entity.date|date("Y/m/d") }}</td>
+	          <td>{{ entity.notes }}</td>
+	          <td class="currency">{{ entity.amount }}</td>
+	        </tr>
+	  	  {% endfor %}
+	        <tr>
+	          <td></td>
+	          <td class="date">
+	            <input type="text" placeholder="Date" name="date" />
+	          </td>
+	          <td>
+	            <input type="text" placeholder="Description" name="description" />
+	          </td>
+	          <td class="currency">
+	            <input type="text" placeholder="Amount" name="amount" />
+	          </td>
+	        </tr>
+	      </tbody>
+	    </table>
+	    <div class="buttons">
+	      <a href="{{ path('invoice_payment_delete', { 'invoiceId': 1 }) }}" class="btn danger icon alternative trash float-left">{% trans %}Remove selected{% endtrans %}</a>
+	      <button type="submit" class="btn success icon alternative add">{% trans %}Add Payment{% endtrans %}</button>
+	      <button type="button" class="btn secondary">{% trans %}OK{% endtrans %}</button>
+	    </div>
+	  </form>
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/Siwapp/InvoiceBundle/Resources/views/Partials/payments_form.html.twig b/src/Siwapp/InvoiceBundle/Resources/views/Partials/payments_form.html.twig
deleted file mode 100644
index 9445d7c..0000000
--- a/src/Siwapp/InvoiceBundle/Resources/views/Partials/payments_form.html.twig
+++ /dev/null
@@ -1,67 +0,0 @@
-<form action="{{ path('invoice_payment_add', { 'invoiceId': invoiceId }) }}" method="post">
-  <table class="condensed-table">
-    <thead>
-      <tr>
-        <th>
-          <input type="checkbox" name="all" />
-        </th>
-        <th class="date">
-          {% trans %}Date{% endtrans %}
-        </th>
-        <th>
-          {% trans %}Description{% endtrans %}
-        </th>
-        <th class="currency">
-          {% trans %}Amount{% endtrans %}
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>
-          <input type="checkbox" name="id[]" value="1" />
-        </td>
-        <td class="date">
-          5/29/11
-        </td>
-        <td>
-          First Payment
-        </td>
-        <td class="currency">
-          1000,00€
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <input type="checkbox" name="id[]" value="2" />
-        </td>
-        <td class="date">
-          9/13/11
-        </td>
-        <td>
-          Second Payment
-        </td>
-        <td class="currency">
-          500,00€
-        </td>
-      </tr>
-      <tr>
-        <td></td>
-        <td class="date">
-          <input type="text" placeholder="Date" name="date" />
-        </td>
-        <td>
-          <input type="text" placeholder="Description" name="description" />
-        </td>
-        <td class="currency">
-          <input type="text" placeholder="Amount" name="amount" />
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <div class="buttons">
-    <a href="{{ path('invoice_payment_delete', { 'invoiceId': 1 }) }}" class="btn danger icon alternative trash float-left">{% trans %}Remove selected{% endtrans %}</a>
-    <button type="submit" class="btn success icon alternative add">{% trans %}Add Payment{% endtrans %}</button>
-    <button type="button" class="btn secondary">{% trans %}OK{% endtrans %}</button>
-  </div>
-</form>
\ No newline at end of file