diff --git a/src/eventButton.js b/src/eventButton.js
index 8fb014a..c98127c 100644
--- a/src/eventButton.js
+++ b/src/eventButton.js
@@ -26,14 +26,37 @@ const EventButton = (obj) => {
   }
   if (obj.eventObj.eventTo || obj.eventObj.eventFrom || obj.eventObj.eventCaller) {
     if (obj.eventObj.eventTo) {
-      eventTo = <button className="selectOrch" onClick={() => { dispatch(getOrchestratorInfo(obj.eventObj.eventTo)) }} ><span className="elipsText">{obj.eventObj.eventTo}</span></button>
+      eventTo =
+        <div className="row" style={{ flex: '1', width: 'unset' }}>
+          <button className="selectOrch" style={{margin: 0, padding: '0.5em'}} onClick={() => { obj.setSearchTerm(obj.eventObj.eventTo) }} >
+            <span className="elipsText">🔎</span>
+          </button>
+          <button className="selectOrch" onClick={() => { dispatch(getOrchestratorInfo(obj.eventObj.eventTo)) }} >
+            <span className="elipsText">{obj.eventObj.eventTo}</span>
+          </button>
+        </div>
     }
     if (obj.eventObj.eventFrom) {
-      eventFrom = <button className="selectOrch" onClick={() => { dispatch(getOrchestratorInfo(obj.eventObj.eventFrom)) }} ><span className="elipsText">{obj.eventObj.eventFrom}</span></button>
+      eventFrom =
+        <div className="row" style={{ flex: '1', width: 'unset' }}>
+          <button className="selectOrch" style={{margin: 0, padding: '0.5em'}}  onClick={() => { obj.setSearchTerm(obj.eventObj.eventFrom) }} >
+            <span className="elipsText">🔎</span>
+          </button>
+          <button className="selectOrch" onClick={() => { dispatch(getOrchestratorInfo(obj.eventObj.eventFrom)) }}>
+            <span className="elipsText">{obj.eventObj.eventFrom}</span>
+          </button>
+        </div >
     }
     if (obj.eventObj.eventCaller) {
       eventCaller =
-        <button className="selectOrch" onClick={() => { dispatch(getOrchestratorInfo(obj.eventObj.eventCaller)) }} ><span className="elipsText">{obj.eventObj.eventCaller}</span></button>
+        <div className="rowAlignLeft" style={{ flex: '1', width: 'unset', margin: 0 }}>
+          <button className="selectOrch" style={{margin: 0, padding: '0.5em'}}  onClick={() => { obj.setSearchTerm(obj.eventObj.eventCaller) }} >
+            <span className="elipsText">🔎</span>
+          </button>
+          <button className="selectOrch" onClick={() => { dispatch(getOrchestratorInfo(obj.eventObj.eventCaller)) }} >
+            <span className="elipsText">{obj.eventObj.eventCaller}</span>
+          </button>
+        </div>
     }
     eventRightAddr = <div className="rowAlignRight" style={{ flex: '1', width: '100%', padding: 0, margin: 0 }}>
       {eventFrom}
@@ -45,7 +68,6 @@ const EventButton = (obj) => {
   let blockNumber;
   if (obj.isFirstOfBlock) {
     blockNumber = <Block block={obj.isFirstOfBlock} time={obj.time} />
-
   }
 
   return (
diff --git a/src/eventViewer.js b/src/eventViewer.js
index ee6f222..8115d69 100644
--- a/src/eventViewer.js
+++ b/src/eventViewer.js
@@ -164,6 +164,7 @@ const EventViewer = (obj) => {
         eventList.push(<EventButton
           key={eventObj.transactionHash + unfiltered}
           eventObj={eventObj}
+          setSearchTerm={setSearchTerm}
         />);
       } else {
         prevBlock = eventObj.transactionBlock;
@@ -172,6 +173,7 @@ const EventViewer = (obj) => {
           eventObj={eventObj}
           isFirstOfBlock={prevBlock}
           time={eventObj.transactionTime}
+          setSearchTerm={setSearchTerm}
         />);
       }
     }
diff --git a/src/orchestratorViewer.js b/src/orchestratorViewer.js
index 24ce1b2..8986f35 100644
--- a/src/orchestratorViewer.js
+++ b/src/orchestratorViewer.js
@@ -134,7 +134,7 @@ const Orchestrator = (obj) => {
         <h3>Orchestrator Info</h3>
       </div>
       <div className="rowAlignLeft">
-        <p>Click on an orchestrator in the list below!</p>
+        <p>Click on an orchestrator address in the list below!</p>
       </div>
     </div>
   )