diff --git a/src/eventButton.js b/src/eventButton.js
index e981850..c0c238d 100644
--- a/src/eventButton.js
+++ b/src/eventButton.js
@@ -22,7 +22,7 @@ const EventButton = (obj) => {
     obj.eventObj.eventTo = "";
   }
   if (obj.eventObj.eventTo !== "" || obj.eventObj.eventFrom !== "") {
-    eventArrow = <p>→</p>;
+    eventArrow = <p style={{marginRight: 0}}>→</p>;
   }
   if (obj.eventObj.eventTo || obj.eventObj.eventFrom || obj.eventObj.eventCaller) {
     if (obj.eventObj.eventTo) {
diff --git a/src/livepeer.js b/src/livepeer.js
index 336ea86..88f7cd6 100644
--- a/src/livepeer.js
+++ b/src/livepeer.js
@@ -17,7 +17,7 @@ const Livepeer = (obj) => {
   console.log("Rendering Livepeer");
 
   useEffect(() => {
-    if (prefill.get('orchAddr') != "") {
+    if (prefill.get('orchAddr') && prefill.get('orchAddr') !== "") {
       dispatch(getOrchestratorInfo(prefill.get('orchAddr')));
     }
   }, [prefill]);