diff --git a/Data/LiveGameDbInitializer.cs b/Data/LiveGameDbInitializer.cs
index 6d9a0a6..f9ab0a1 100644
--- a/Data/LiveGameDbInitializer.cs
+++ b/Data/LiveGameDbInitializer.cs
@@ -33,7 +33,8 @@ namespace LiveGameFeed.Data
                         new Feed()
                         {
                             Description = "Match started",
-                            MatchId = 1
+                            MatchId = 1,
+                            CreatedAt = DateTime.Now
                         }
                     }
                 };
@@ -51,7 +52,8 @@ namespace LiveGameFeed.Data
                         new Feed()
                         {
                             Description = "Match started",
-                            MatchId = 2
+                            MatchId = 2,
+                            CreatedAt = DateTime.Now
                         }
                     }
                 };
diff --git a/app/shared/components/chat.component.html b/app/shared/components/chat.component.html
index 0480f3c..f0f1a00 100644
--- a/app/shared/components/chat.component.html
+++ b/app/shared/components/chat.component.html
@@ -12,7 +12,7 @@
         </tr>
         <tr>
             <td colspan="2">
-                <div class="feed-table">
+                <div class="chat-table">
                     <table class="table table-striped">
                         <thead>
                             <tr>
diff --git a/app/shared/components/match.component.html b/app/shared/components/match.component.html
index 2d03851..f386aa4 100644
--- a/app/shared/components/match.component.html
+++ b/app/shared/components/match.component.html
@@ -22,7 +22,7 @@
                 <button type="button" class="btn btn-default btn-md" (click)="setSubscription(true)" *ngIf="!subscribed">
                             Subscribe to feed
                         </button>
-                <button type="button" class="btn btn-danger btn-md" (click)="unsubscribe(false)" *ngIf="subscribed">
+                <button type="button" class="btn btn-danger btn-md" (click)="setSubscription(false)" *ngIf="subscribed">
                             Unubscribe
                         </button>
             </td>
diff --git a/wwwroot/css/site.css b/wwwroot/css/site.css
index b110977..c4adc1f 100644
--- a/wwwroot/css/site.css
+++ b/wwwroot/css/site.css
@@ -32,6 +32,11 @@ th, td {
     overflow: auto;
 }
 
+.chat-table {
+    height: 240px;
+    overflow: auto;
+}
+
 .feed-time {
     color:brown;
     font-size: 10px;