diff --git a/client/claim/src/detail/index.html b/client/claim/src/detail/index.html
index 068765e2a4..6137d76a93 100644
--- a/client/claim/src/detail/index.html
+++ b/client/claim/src/detail/index.html
@@ -2,12 +2,22 @@
     vn-id="model"
     url="claim/api/ClaimBeginnings"
     filter="$ctrl.filter"
-    data="$ctrl.salesClaimed" on-data-change="$ctrl.onDataChange()">
+    data="$ctrl.salesClaimed">
 </vn-crud-model>
 <vn-vertical>
     <vn-card pad-large>
         <vn-vertical>
-            <vn-title>Detail</vn-title>
+            <vn-horizontal>
+                <vn-title vn-two>Detail</vn-title>
+                <div class="totalBox">
+                        <vn-label-value label="Total" 
+                            value="{{$ctrl.paidTotal | currency:'€':2}}">
+                        </vn-label-value>
+                        <vn-label-value label="Total claimed" 
+                            value="{{$ctrl.claimedTotal | currency:'€':2}}">
+                        </vn-label-value>
+                    </div>
+            </vn-horizontal>
             <vn-table model="model">
                 <vn-thead>
                     <vn-tr>
@@ -22,12 +32,13 @@
                     </vn-tr>
                 </vn-thead>
                 <vn-tbody>
-                    <vn-tr ng-repeat="saleClaimed in $ctrl.salesClaimed" vn-repeat-last on-last="$ctrl.focusLastInput()">
+                    <vn-tr ng-repeat="saleClaimed in $ctrl.salesClaimed" vn-repeat-last on-last="$ctrl.calculateTotals()">
                         <vn-td number>{{saleClaimed.sale.id}}</vn-td>
                         <vn-td number>{{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}}</vn-td>
                         <vn-td number>{{saleClaimed.sale.quantity}}</vn-td>
                         <vn-td number>
                             <vn-textfield 
+                                vn-focus
                                 id="claimedQuantity"
                                 model="saleClaimed.quantity"
                                 on-change="$ctrl.setClaimedQuantity(saleClaimed.id, saleClaimed.quantity)"
@@ -59,16 +70,11 @@
                     No results
                 </vn-empty-rows>
             </vn-table>
-            <vn-one pad-medium-top>
-                <vn-icon-button
-                    vn-bind="+"
-                    vn-tooltip="Add tag"
-                    icon="add_circle"
-                    ng-click="$ctrl.openAddSalesDialog()">
-                </vn-icon-button>
-            </vn-one>
         </vn-vertical>
     </vn-card>
+    <a ng-click="$ctrl.openAddSalesDialog()" vn-tooltip="New item" vn-bind="+" fixed-bottom-right>
+        <vn-float-button icon="add"></vn-float-button>
+    </a>
 
 <!-- Add Lines Dialog -->
 <vn-dialog 
diff --git a/client/claim/src/detail/index.js b/client/claim/src/detail/index.js
index ae353f903a..6f4a25ea7b 100644
--- a/client/claim/src/detail/index.js
+++ b/client/claim/src/detail/index.js
@@ -58,11 +58,6 @@ class Controller {
         });
     }
 
-    focusLastInput() {
-        let inputs = document.querySelectorAll("#claimedQuantity");
-        inputs[inputs.length - 1].querySelector("input").select();
-    }
-
     setClaimedQuantity(id, claimedQuantity) {
         let params = {id: id, quantity: claimedQuantity};
         let query = `claim/api/ClaimBeginnings/`;
@@ -71,6 +66,17 @@ class Controller {
             this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
         });
     }
+
+    calculateTotals() {
+        this.paidTotal = 0;
+        this.salesClaimed.forEach(sale => {
+            this.paidTotal += (sale.sale.quantity * sale.sale.price) - ((sale.sale.discount * (sale.sale.quantity * sale.sale.price)) / 100);
+        });
+        this.claimedTotal = 0;
+        this.salesClaimed.forEach(sale => {
+            this.claimedTotal += (sale.quantity * sale.sale.price) - ((sale.sale.discount * (sale.quantity * sale.sale.price)) / 100);
+        });
+    }
 }
 
 Controller.$inject = ['$state', '$scope', '$http', '$translate', 'vnApp'];
diff --git a/client/claim/src/detail/index.spec.js b/client/claim/src/detail/index.spec.js
index d6769a022a..084841f4af 100644
--- a/client/claim/src/detail/index.spec.js
+++ b/client/claim/src/detail/index.spec.js
@@ -1,6 +1,6 @@
 import './index.js';
 
-describe('claim', () => {
+fdescribe('claim', () => {
     describe('Component vnClaimDetail', () => {
         let $componentController;
         let controller;
@@ -90,5 +90,15 @@ describe('claim', () => {
                 expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
             });
         });
+
+        describe('calculateTotals()', () => {
+            it('should set paidTotal and claimedTotal to 0 if salesClaimed has no data', () => {
+                controller.salesClaimed = [];
+                controller.calculateTotals();
+
+                expect(controller.paidTotal).toEqual(0);
+                expect(controller.claimedTotal).toEqual(0);
+            });
+        });
     });
 });