diff --git a/src/app/app.component.html b/src/app/app.component.html
index dc2692d..ba88667 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,28 +1,26 @@
-<div class="app">
-  <div class="pt-4 px-3">
-    <app-logo></app-logo>
-  </div>
-  <div class="background mt-4">
-    <div class="unblur pt-2">
-      <div class="container">
-        <div class="mt-3 mb-2 pb-4 row justify-content-center">
-          <div class="col-lg-4 pb-3">
-            <div class="blue-header card-header">
-              <i class="lni lni-wallet"></i>
-              <h4 class="pl-3 d-inline">Make Transfer</h4>
-            </div>
-            <app-transaction-form (newTransfer)="recieveTransfer($event)"></app-transaction-form>
+<div class="pt-4 px-3">
+  <app-logo></app-logo>
+</div>
+<div class="background mt-4">
+  <div class="unblur pt-2">
+    <div class="container">
+      <div class="mt-3 mb-2 pb-4 row justify-content-center">
+        <div class="col-lg-4 pb-3">
+          <div class="blue-header card-header">
+            <i class="lni lni-wallet"></i>
+            <h4 class="pl-3 d-inline">Make Transfer</h4>
           </div>
-          <div class="col-lg-8">
-            <div class="blue-header card-header">
-              <i class="lni lni-list"></i>
-              <h4 class="pl-3 d-inline">Transactions List</h4>
-            </div>
-            <app-transaction-list [newTransaction]="transaction"></app-transaction-list>
+          <app-transaction-form (newTransfer)="recieveTransfer($event)"></app-transaction-form>
+        </div>
+        <div class="col-lg-8">
+          <div class="blue-header card-header">
+            <i class="lni lni-list"></i>
+            <h4 class="pl-3 d-inline">Transactions List</h4>
           </div>
+          <app-transaction-list [newTransaction]="transaction"></app-transaction-list>
         </div>
       </div>
     </div>
   </div>
-  <app-footer></app-footer>
-</div>
\ No newline at end of file
+</div>
+<app-footer></app-footer>
\ No newline at end of file
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 2aa9307..ef0b541 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,7 +4,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { BbUIModule } from 'bb-ui/bb-ui.module';
 import { AppComponent } from './app.component';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { HttpClientJsonpModule, HttpClientModule } from '@angular/common/http';
+import { HttpClientModule } from '@angular/common/http';
 import { TransactionFormComponent } from './transaction-form/transaction-form.component';
 import { TransactionListComponent } from './transaction-list/transaction-list.component';
 
@@ -21,7 +21,6 @@ import { TransactionListComponent } from './transaction-list/transaction-list.co
     FormsModule,
     ReactiveFormsModule,
     HttpClientModule,
-    HttpClientJsonpModule,
     NgbModule,
   ],
   providers: [],
diff --git a/src/app/model.ts b/src/app/model.ts
index 74f7b61..98a6825 100644
--- a/src/app/model.ts
+++ b/src/app/model.ts
@@ -19,7 +19,7 @@ export class Transaction {
 
   constructor(tAmount?: number, tType?: string, merchantName?: string, date?: number) {
     this.categoryCode = "#d9bcf5"
-    this.dates = { valueDate: date ? date : 1234 }
+    this.dates = { valueDate: date || Date.now() }
     this.transaction = {
       amountCurrency: { amount: tAmount || 0, currencyCode: "EUR" },
       type: tType || "New Transfer",
diff --git a/src/app/transaction-form/transaction-form.component.spec.ts b/src/app/transaction-form/transaction-form.component.spec.ts
index dd42ee1..292c84e 100644
--- a/src/app/transaction-form/transaction-form.component.spec.ts
+++ b/src/app/transaction-form/transaction-form.component.spec.ts
@@ -1,28 +1,22 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormBuilder } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { SubmitButtonComponent } from 'bb-ui/components/submit-button/submit-button.component';
-import { collapseTextChangeRangesAcrossMultipleVersions } from 'typescript';
 
 import { TransactionFormComponent } from './transaction-form.component';
 
 describe('TransactionFormComponent', () => {
   let component: TransactionFormComponent;
-  let component2: ComponentFixture<SubmitButtonComponent>;
-
   let fixture: ComponentFixture<TransactionFormComponent>;
-  let fixture2: ComponentFixture<SubmitButtonComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [TransactionFormComponent, SubmitButtonComponent],
+      declarations: [TransactionFormComponent],
       providers: [FormBuilder]
     }).compileComponents();
   });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(TransactionFormComponent);
-    fixture2 = TestBed.createComponent(SubmitButtonComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });