diff --git a/user_client/v1/webclient.js b/user_client/v1/webclient.js
index 62e6b7a..74312ce 100644
--- a/user_client/v1/webclient.js
+++ b/user_client/v1/webclient.js
@@ -132,38 +132,6 @@ updateRewardList();
 
 
 
-fetch_reRunEvent = (fetchURL) => response = fetch(fetchURL)
-.then((response) => {
-    return response.text();
-})
-
-
-RerunEvent_OBJ = async (eventToRun) => {
-    if (true) {
-        let exampleEvent = {
-            'eventName': "",
-            'eventTime': "",
-            'eventType': "",
-            'eventSender': "",
-            'eventData': ""
-        }
-        let params = "?eventName="+encodeURIComponent(eventToRun.eventName)+
-        "&"+"eventTime="+encodeURIComponent(eventToRun.eventTime)+
-        "&"+"eventType="+encodeURIComponent(eventToRun.eventType)+
-        "&"+"eventSender="+encodeURIComponent(eventToRun.eventSender)+
-        "&"+"eventData="+encodeURIComponent(eventToRun.eventData);
-        let targetURL = "http://127.0.0.1:42055/api/v1/user_client/event_log/reRunEvent"+params;
-        //console.log(targetURL)
-        let a = await fetch_reRunEvent(targetURL);
-        //console.log("return: "+a);
-        return a
-    }
-    else {
-        return None
-    }
-}
-
-
 GetEventList = async () => {
     if (true) {
         let ListRequestOBJ = {
@@ -237,24 +205,57 @@ async function updateEventList() {
             console.log(eventType)
             console.log(eventSender)
 
+            var reRunEvent_Params = String("reRunEvent(" + eventName + ", " + eventTime + ", " + eventType + ", " + eventSender + ", " + eventData+")")
+            //let reRunEvent_Params = String("reRunEvent()")
             let template = ""+
             "<div class=\"rowsInMain row card\">"+
-            "<div class=\"col s3\"><p>Event:"+ eventName +"</p></div>"+
-            "<div class=\"col s3\"><p>User:"+ eventSender +"</p></div>"+
-            "<div class=\"col s3\"><p>Message:"+ eventData +"</p></div>"+
-            "<a onclick=\"reRunEvent()\" class=\"btn waves-effect waves-light green right col s1\" style=\"position: absolute; right: 0; top: 0; width: 3em;\">"+
+            "<div class=\"col s12\" style=\"position:absolute;top:0;color:grey;\">Time: "+ eventTime +"</div>"+
+            "<div class=\"col s3\"><p>Event: "+ eventName +"</p></div>"+
+            "<div class=\"col s3\"><p>User: "+ eventSender +"</p></div>"+
+            "<div class=\"col s3\"><p>Message: "+ eventData +"</p></div>"+
+            "<a onclick=\""+ reRunEvent_Params +"\" class=\"btn waves-effect waves-light green right col s1\" style=\"position: absolute; right: 0; top: 0; width: 3em;\">"+
             "<i class=\"material-icons\">refresh</i>"+
             "</a></div>"
             $("#EventHistoryWrapper").append(template);
         }
     }finally {
-        
+
     }
 
 }
 updateEventList();
 
-async function reRunEvent(eventName, eventTime, eventType, eventSender, eventData) {
+
+
+
+RerunEvent_OBJ = async (eventToRun) => {
+    if (true) {
+        let exampleEvent = {
+            'eventName': "",
+            'eventTime': "",
+            'eventType': "",
+            'eventSender': "",
+            'eventData': ""
+        }
+        let params = ""+
+        "?eventName="+encodeURIComponent(eventToRun['eventName'])+
+        "&"+"eventTime="+encodeURIComponent(eventToRun['eventTime'])+
+        "&"+"eventType="+encodeURIComponent(eventToRun['eventType'])+
+        "&"+"eventSender="+encodeURIComponent(eventToRun['eventSender'])+
+        "&"+"eventData="+encodeURIComponent(eventToRun['eventData']);
+        let targetURL = "http://127.0.0.1:42055/api/v1/user_client/event_log/reRunEvent"+params;
+        //console.log(targetURL)
+        let a = await fetch(targetURL);
+        //console.log("return: "+a);
+        return a
+    }
+    else {
+        return None
+    }
+}
+
+
+async function reRunEvent() {
     var newEvent = {
         'eventName': eventName,
         'eventTime': eventTime,