diff --git a/src/components/LotteryPage.vue b/src/components/LotteryPage.vue
index b0d6454..5306a90 100644
--- a/src/components/LotteryPage.vue
+++ b/src/components/LotteryPage.vue
@@ -11,9 +11,7 @@ import VirtualLotteryPage from "@/components/VirtualLotteryPage";
 
 export default {
   components: {
-    Tabs,
-    GeneratePage,
-    VirtualLotteryPage
+    Tabs
   },
   data() {
     return {
diff --git a/src/components/VirtualLotteryPage.vue b/src/components/VirtualLotteryPage.vue
index 38bb08a..cb2730b 100644
--- a/src/components/VirtualLotteryPage.vue
+++ b/src/components/VirtualLotteryPage.vue
@@ -43,9 +43,11 @@
       
     
     
@@ -74,6 +76,9 @@ export default {
       attendeesFetched: false,
       winnersFetched: false,
       chatHistory: [],
+      historyPage: 0,
+      historyPageSize: 100,
+      lastHistoryPage: false,
       usernameAccepted: false,
       username: null,
       wasDisconnected: false,
@@ -158,6 +163,15 @@ export default {
     sendMessage: function(msg) {
       this.socket.emit("chat", { message: msg });
     },
+    loadMoreHistory: function() {
+      const { historyPage, historyPageSize } = this;
+      const page = historyPage + 1;
+
+      getChatHistory(page * historyPageSize, historyPageSize).then(messages => {
+        this.chatHistory = messages.concat(this.chatHistory);
+        this.historyPage = page;
+      });
+    },
     getWinners: async function() {
       let response = await winners();
       if (response) {
diff --git a/src/ui/Chat.vue b/src/ui/Chat.vue
index 0ac2a4f..522e214 100644
--- a/src/ui/Chat.vue
+++ b/src/ui/Chat.vue
@@ -3,12 +3,18 @@
     
     Chat
     
-      
+      
+        
+      
+      
-        
[{{ getTime(history.timestamp) }}]
-        
{{ history.username }}:
+        
+          {{ history.username }}
+          {{ getTime(history.timestamp) }}
+        
         {{ history.message }}
       
-      
+      
     
   
 
@@ -54,9 +49,6 @@ export default {
 h1 {
   text-align: center;
 }
-.hide {
-  display: none;
-}
 
 .tab-container {
   display: flex;