diff --git a/client/src/app/card-display-dialog/card-display-dialog.component.css b/client/src/app/card-display-dialog/card-display-dialog.component.css
index df37063..ae6177c 100644
--- a/client/src/app/card-display-dialog/card-display-dialog.component.css
+++ b/client/src/app/card-display-dialog/card-display-dialog.component.css
@@ -11,11 +11,3 @@
     margin-left: 1em;
 }
 
-.button{
-    border-radius: 2px;
-    border-style:none;
-    background-color: lightgreen;
-    padding:15px;
-    padding-right:18px;
-    padding-left:18px;
-}
diff --git a/client/src/app/card-display-dialog/card-display-dialog.component.html b/client/src/app/card-display-dialog/card-display-dialog.component.html
index 1322db3..da2f0bf 100644
--- a/client/src/app/card-display-dialog/card-display-dialog.component.html
+++ b/client/src/app/card-display-dialog/card-display-dialog.component.html
@@ -21,10 +21,13 @@ <h4 mat-line class="card-cont">{{General_sense}}</h4>
         <div>
             <h4 mat-line class="card-cont">{{Example_usage}}</h4>
         </div>
-
     </mat-list>
-    <div id="button-controls">
-        <hr>
-        <button class="button">Edit</button>
-    </div>
 </mat-dialog-content>
+<mat-dialog-actions *ngIf="editShown" id="button-controls">
+    <button mat-raised-button class="card-edit-fab" mat-tooltip="Peek At Hints" matTooltipPosition="right">
+        <mat-icon class="md-24" aria-label="Edit Card">mode edit</mat-icon>
+    </button>
+</mat-dialog-actions>
+
+
+
diff --git a/client/src/app/card-display-dialog/card-display-dialog.component.ts b/client/src/app/card-display-dialog/card-display-dialog.component.ts
index 5b2f1b8..f405d0c 100644
--- a/client/src/app/card-display-dialog/card-display-dialog.component.ts
+++ b/client/src/app/card-display-dialog/card-display-dialog.component.ts
@@ -9,9 +9,9 @@ import {MatDialogConfig, MatDialogRef, MatSnackBar, MAT_DIALOG_DATA} from "@angu
 })
 export class CardDisplayDialogComponent implements OnInit {
 
-    constructor(public matDialogRef: MatDialogRef<CardDisplayDialogComponent>,
+    constructor( public matDialogRef: MatDialogRef<CardDisplayDialogComponent>,
                 @Inject(MAT_DIALOG_DATA)
-                public data: { Word: string, Synonym: string, Antonym: string, General_sense: string, Example_usage: string })
+                public data: { Word: string, Synonym: string, Antonym: string, General_sense: string, Example_usage: string, editShown:boolean })
     {  }
 
 
@@ -20,6 +20,7 @@ export class CardDisplayDialogComponent implements OnInit {
     Antonym: string;
     General_sense: string;
     Example_usage: string;
+    editShown: boolean;
 
     // @Input() card: Card;
 
@@ -29,8 +30,12 @@ export class CardDisplayDialogComponent implements OnInit {
         this.Antonym = this.data.Antonym;
         this.General_sense = this.data.General_sense;
         this.Example_usage = this.data.Example_usage;
+        this.editShown = this.data.editShown;
         console.log(this.data);
         console.log(this.Word);
+    }
 
+    setEditShown(value: boolean){
+        this.editShown = value;
     }
 }
diff --git a/client/src/app/card-list-component/card-list.component.ts b/client/src/app/card-list-component/card-list.component.ts
index 704a9c0..c983d3b 100644
--- a/client/src/app/card-list-component/card-list.component.ts
+++ b/client/src/app/card-list-component/card-list.component.ts
@@ -38,11 +38,12 @@ export class CardListComponent implements OnInit {
             Synonym: presentCard.synonym,
             Antonym: presentCard.antonym,
             General_sense: presentCard.general_sense,
-            Example_usage: presentCard.example_usage
+            Example_usage: presentCard.example_usage,
         };
         console.log(config);
 
         let cardRef = this.peek.open(CardDisplayDialogComponent, config);
+       // cardRef.setEditShown(true);
     };
 
     constructor(public CardListService: CardListService,public peek: MdDialog) {