diff --git a/pages/index.vue b/pages/index.vue
index ffaa5de7a..eb78da41c 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -88,7 +88,7 @@
                 <option value="Users"></option>
               </datalist>
             </li>
-            <div>
+            <ul>
               <li>
                 <label class="hide-on-small-screen" for="send">&nbsp;</label>
                 <button
@@ -104,7 +104,7 @@
                   </span>
                 </button>
               </li>
-            </div>
+            </ul>
           </ul>
           <div
             class="blue"
diff --git a/pages/websocket.vue b/pages/websocket.vue
index c8e6ccfc9..113643a6c 100644
--- a/pages/websocket.vue
+++ b/pages/websocket.vue
@@ -84,6 +84,10 @@
           </li>
         </div>
       </ul>
+
+<input type="text" name="" value="">
+<button type="button" name="button" @click="start()"></button>
+<div id="result"></div>
     </pw-section>
   </div>
 </template>
@@ -253,6 +257,16 @@ export default {
       if (Object.keys(sourceEmojis).includes(source))
         return sourceEmojis[source];
       return "";
+    },
+    start() {
+      if(typeof(EventSource) !== "undefined") {
+        var source = new EventSource("http://wgrothaus.ucc.ie/~frank/cs3513/server_event_source.php");
+        source.onmessage = function(event) {
+          document.getElementById("result").innerHTML += event.data + "<br>";
+        };
+      } else {
+        document.getElementById("result").innerHTML = "Sorry, your browser does not support server-sent events...";
+      }
     }
   },
   updated: function() {