diff --git a/src/app/components/main/main.component.html b/src/app/components/main/main.component.html
index 665bce8..7ed5bc0 100644
--- a/src/app/components/main/main.component.html
+++ b/src/app/components/main/main.component.html
@@ -27,17 +27,15 @@
                 Previous Card
             </div>
             <card *ngIf="previousCardNumber > -1" class="" [number]="workoutDeck[previousCardNumber].value"
-                [suit]="workoutDeck[previousCardNumber].suit" (cardEmitter)="displayExercise()"
-                (click)="decrementCardCounter()"></card>
+                [suit]="workoutDeck[previousCardNumber].suit" (click)="decrementCardCounter()"></card>
         </div>
         <!-- Current card -->
         <div class="col-md-4 col-sm-12 center">
             <div *ngIf="currentCardNumber < workoutDeck.length" class="alert alert-success" role="alert">
                 Current Card
             </div>
-            <card *ngIf="currentCardNumber < workoutDeck.length" class=""
-                [number]="workoutDeck[currentCardNumber].value" [suit]="workoutDeck[currentCardNumber].suit"
-                (click)="incrementCardCounter()"></card>
+            <card *ngIf="currentCardNumber < workoutDeck.length" class=""[number]="workoutDeck[currentCardNumber].value"
+                [suit]="workoutDeck[currentCardNumber].suit" (click)="incrementCardCounter()"></card>
         </div>
         <!-- Exercise info -->
         <div class="col-md-4 col-sm-12 center">
diff --git a/src/app/components/main/main.component.ts b/src/app/components/main/main.component.ts
index 9acaeec..6335c05 100644
--- a/src/app/components/main/main.component.ts
+++ b/src/app/components/main/main.component.ts
@@ -51,6 +51,7 @@ export class MainComponent implements OnInit {
         this.exercise = undefined;
         this.currentCardNumber = 0;
         this.previousCardNumber = -1;
+        this.displayExercise();
     }
 
     public createDeck() {