diff --git a/src/containers/Dashboard.js b/src/containers/Dashboard.js
index 95cea5344..a74c37376 100644
--- a/src/containers/Dashboard.js
+++ b/src/containers/Dashboard.js
@@ -88,7 +88,6 @@ export default class {
   handleEditTicket(e, bill, bills) {
     if (this.counter === undefined || this.id !== bill.id) this.counter = 0
     if (this.id === undefined || this.id !== bill.id) this.id = bill.id
-    if (this.id === bill.id) this.counter = 0
     if (this.counter % 2 === 0) {
       bills.forEach(b => {
         $(`#open-bill${b.id}`).css({ background: '#0D5AE5' })
@@ -146,7 +145,7 @@ export default class {
     }
 
     bills.forEach(bill => {
-      $(`#open-bill${bill.id}`).click((e) => this.handleEditTicket(e, bill, bills))
+      $(`#open-bill${bill.id}`).off().on("click",((e) => this.handleEditTicket(e, bill, bills)));
     })
 
     return bills
diff --git a/src/containers/NewBill.js b/src/containers/NewBill.js
index d4967fb57..03c80e732 100644
--- a/src/containers/NewBill.js
+++ b/src/containers/NewBill.js
@@ -14,6 +14,7 @@ export default class NewBill {
     this.fileName = null
     this.billId = null
     new Logout({ document, localStorage, onNavigate })
+    //disable submit button
   }
   handleChangeFile = e => {
     e.preventDefault()
@@ -27,7 +28,12 @@ export default class NewBill {
     formData.append('file', file)
     formData.append('email', email)
 
-   
+    if (fileExtension != "png" && fileExtension != "jpg" && fileExtension != "jpeg") {
+      //disable submit button
+      //add error message 
+    }
+    else {
+      //enable submit button
       this.store
       .bills()
       .create({
@@ -41,11 +47,9 @@ export default class NewBill {
         this.billId = key
         this.fileUrl = fileUrl
         this.fileName = fileName
-        if (fileExtension != "png" && fileExtension != "jpg" && fileExtension != "jpeg") {
-          throw new Error ("Wrong file extension ")
-        }
+     
       }).catch(error => console.error(error))
-
+    }
   }
 
   handleSubmit = e => {
diff --git a/src/views/BillsUI.js b/src/views/BillsUI.js
index bf27cafc1..86fc739d2 100644
--- a/src/views/BillsUI.js
+++ b/src/views/BillsUI.js
@@ -20,7 +20,11 @@ const row = (bill) => {
   }
 
 const rows = (data) => {
-  return (data && data.length) ? data.map(bill => row(bill)).join("") : ""
+  if ((data && data.length)) {
+    const dataSorted = data.sort((a, b)=> ((a.date < b.date) ? 1 : -1))
+    return (dataSorted.map(bill => row(bill)).join(""))
+  }
+  else {return ("")}
 }
 
 export default ({ data: bills, loading, error }) => {