diff --git a/src/app/components/main/main.component.html b/src/app/components/main/main.component.html
index 80e1980..665bce8 100644
--- a/src/app/components/main/main.component.html
+++ b/src/app/components/main/main.component.html
@@ -22,20 +22,20 @@
 <div *ngIf="workoutDeck && showCards" class="container">
     <div class="row">
         <!-- Previous card -->
-        <div *ngIf="previousCardNumber > -1" class="col-md-4 col-sm-12 center">
-            <div class="alert alert-danger" role="alert">
+        <div class="col-md-4 col-sm-12 center">
+            <div *ngIf="previousCardNumber > -1" class="alert alert-danger" role="alert">
                 Previous Card
             </div>
-            <card class="" [number]="workoutDeck[previousCardNumber].value"
+            <card *ngIf="previousCardNumber > -1" class="" [number]="workoutDeck[previousCardNumber].value"
                 [suit]="workoutDeck[previousCardNumber].suit" (cardEmitter)="displayExercise()"
                 (click)="decrementCardCounter()"></card>
         </div>
         <!-- Current card -->
-        <div *ngIf="currentCardNumber < workoutDeck.length" class="col-md-4 col-sm-12 center">
-            <div class="alert alert-success" role="alert">
+        <div class="col-md-4 col-sm-12 center">
+            <div *ngIf="currentCardNumber < workoutDeck.length" class="alert alert-success" role="alert">
                 Current Card
             </div>
-            <card  class=""
+            <card *ngIf="currentCardNumber < workoutDeck.length" class=""
                 [number]="workoutDeck[currentCardNumber].value" [suit]="workoutDeck[currentCardNumber].suit"
                 (click)="incrementCardCounter()"></card>
         </div>