diff --git a/frontend/src/components/transactions/Create.vue b/frontend/src/components/transactions/Create.vue
index 5576dcc520..4f650dced0 100644
--- a/frontend/src/components/transactions/Create.vue
+++ b/frontend/src/components/transactions/Create.vue
@@ -71,7 +71,7 @@
                      
                   </div>
                   <button type="button" class="btn btn-outline-primary btn-block" @click="addTransactionArray"><span class="far fa-clone"></span> {{
-                      $t('firefly.add_another_split')
+                    $t('firefly.add_another_split')
                     }}
                   </button>
                 </div>
@@ -334,7 +334,6 @@ export default {
         for (let i in this.transactions) {
           if (this.transactions.hasOwnProperty(i) && /^0$|^[1-9]\d*$/.test(i) && i <= 4294967294) {
             if (this.transactions.hasOwnProperty(i)) {
-              //this.
               // console.log('Reset attachment #' + i);
               this.updateField({index: i, field: 'transaction_journal_id', value: 0});
               this.updateField({index: i, field: 'errors', value: this.defaultErrors})
@@ -345,7 +344,8 @@ export default {
       // reset the form:
       if (this.resetFormAfter) {
         this.resetTransactions();
-        this.addTransaction();
+        setTimeout(this.addTransaction, 50);
+
       }
       return Promise.resolve({response: 'from finaliseSubmission'});
     },
@@ -434,10 +434,10 @@ export default {
       this.updateField({index: payload.index, field: payload.direction + '_account_currency_symbol', value: payload.currency_symbol});
 
       //this.calculateTransactionType(payload.index);
-      if('source' === payload.direction && true === payload.user_selected) {
+      if ('source' === payload.direction && true === payload.user_selected) {
         this.$refs.splitForms[payload.index].$refs.destinationAccount.giveFocus();
       }
-      if('destination' === payload.direction && true === payload.user_selected) {
+      if ('destination' === payload.direction && true === payload.user_selected) {
         this.$refs.splitForms[payload.index].$refs.amount.giveFocus();
       }
     },
diff --git a/frontend/src/components/transactions/TransactionListLarge.vue b/frontend/src/components/transactions/TransactionListLarge.vue
index 90f4a71f44..c5a0151cd0 100644
--- a/frontend/src/components/transactions/TransactionListLarge.vue
+++ b/frontend/src/components/transactions/TransactionListLarge.vue
@@ -53,9 +53,9 @@
               </template>
               <template #cell(type)="data">
                 <span v-if="!data.item.dummy">
-                  <span class="fas fa-long-arrow-alt-right" v-if="'deposit' === data.item.type"></span>
-                  <span class="fas fa-long-arrow-alt-left" v-else-if="'withdrawal' === data.item.type"></span>
-                  <span class="fas fa-long-arrows-alt-h" v-else-if="'transfer' === data.item.type"></span>
+                  <span class="fas fa-long-arrow-alt-right" v-if="'deposit' === data.item.type.toLowerCase()"></span>
+                  <span class="fas fa-long-arrow-alt-left" v-if="'withdrawal' === data.item.type.toLowerCase()"></span>
+                  <span class="fas fa-arrows-alt-h" v-if="'transfer' === data.item.type.toLowerCase()"></span>
                 </span>
               </template>
               <template #cell(description)="data">
@@ -86,7 +86,7 @@
                 <span :class="'text-danger ' + (!data.item.collapsed ? 'font-weight-bold' : '')" v-if="'withdrawal' === data.item.type">
                   {{ Intl.NumberFormat(locale, {style: 'currency', currency: data.item.currency_code}).format(-data.item.amount) }}
                 </span>
-                <span :class="'text-muted ' + (!data.item.collapsed ? 'font-weight-bold' : '')" v-if="'transfer' === data.item.type">
+                <span :class="'text-muted ' + (!data.item.collapsed ? 'font-weight-bold' : '')" v-if="'transfer' === data.item.type.toLowerCase()">
                   {{ Intl.NumberFormat(locale, {style: 'currency', currency: data.item.currency_code}).format(data.item.amount) }}
                 </span>
                 <br />