diff --git a/src/components/OrchAddressViewer.js b/src/components/OrchAddressViewer.js
index 5dee54f..66aa0fb 100644
--- a/src/components/OrchAddressViewer.js
+++ b/src/components/OrchAddressViewer.js
@@ -9,11 +9,11 @@ const Address = (obj) => {
   let thisInfo = null;
   const now = new Date().getTime();
   // Lookup domain in cache
-  if (livepeer.ensDomainMapping){
-      for (const thisAddr of livepeer.ensDomainMapping) {
-        if (thisAddr.address === obj.address) {
-          thisDomain = thisAddr;
-          // Check timeout
+  if (livepeer.ensDomainMapping) {
+    for (const thisAddr of livepeer.ensDomainMapping) {
+      if (thisAddr.address === obj.address) {
+        thisDomain = thisAddr;
+        // Check timeout
         if (now - thisAddr.timestamp < 86400000) {
           break;
         }
@@ -61,17 +61,13 @@ const Address = (obj) => {
     thisName = thisInfo.domain;
     if (thisInfo.avatar) {
       thisIcon =
-        <a className="selectOrchLight" style={{cursor: 'alias'}} target="_blank" rel="noopener noreferrer" href={"https://app.ens.domains/name/" + thisInfo.domain + "/details"} >
-          <div className="rowAlignLeft">
-            <img alt="" src={thisInfo.avatar} width="20" height="20" />
-          </div>
+        <a className="selectOrchLight" style={{ padding: '0.2em', cursor: 'alias' }} target="_blank" rel="noopener noreferrer" href={"https://app.ens.domains/name/" + thisInfo.domain + "/details"} >
+          <img alt="" src={thisInfo.avatar} width="20em" height="20em" />
         </a >
     } else {
       thisIcon =
-        <a className="selectOrchLight" style={{cursor: 'alias'}} target="_blank" rel="noopener noreferrer" href={"https://app.ens.domains/name/" + thisInfo.domain + "/details"} >
-          <div className="rowAlignLeft">
-            <img alt="" src="ens.png" width="20" height="20" />
-          </div>
+        <a className="selectOrchLight" style={{ padding: '0.2em', cursor: 'alias' }} target="_blank" rel="noopener noreferrer" href={"https://app.ens.domains/name/" + thisInfo.domain + "/details"} >
+          <img alt="" src="ens.png" width="20em" height="20em" />
         </a >
     }
   } else {
@@ -81,10 +77,8 @@ const Address = (obj) => {
 
   return (
     <div className="rowAlignLeft">
-      <a className="selectOrchLight" style={{cursor: 'alias'}} target="_blank" rel="noopener noreferrer" href={"https://explorer.livepeer.org/accounts/" + obj.address} >
-        <div className="rowAlignLeft">
-          <img alt="" src="livepeer.png" width="20" height="20" />
-        </div>
+      <a className="selectOrchLight" style={{ padding: '0.2em', cursor: 'alias' }} target="_blank" rel="noopener noreferrer" href={"https://explorer.livepeer.org/accounts/" + obj.address} >
+        <img alt="" src="livepeer.png" width="20em" height="20em" />
       </a>
       {thisIcon}
       <span className="elipsText elipsOnMobile">{thisName}</span>
diff --git a/src/components/OrchInfoViewer.js b/src/components/OrchInfoViewer.js
index 3a2e468..f21a45f 100644
--- a/src/components/OrchInfoViewer.js
+++ b/src/components/OrchInfoViewer.js
@@ -101,11 +101,11 @@ const OrchInfoViewer = (obj) => {
       }
       if (thisInfo.url) {
         ensUrl =
-        <a className="selectOrchLight" style={{cursor: 'alias'}} target="_blank" rel="noopener noreferrer" href={"https://" + thisInfo.url} >
-          <div className="rowAlignLeft">
-          <span>{thisInfo.url}</span>
-          </div>
-        </a >
+          <a className="selectOrchLight" style={{ cursor: 'alias' }} target="_blank" rel="noopener noreferrer" href={"https://" + thisInfo.url} >
+            <div className="rowAlignLeft">
+              <span>{thisInfo.url}</span>
+            </div>
+          </a >
       }
     }
 
@@ -114,10 +114,10 @@ const OrchInfoViewer = (obj) => {
         <div className="stroke sideMargin">
           <div className="verticalDivider" />
           <div className="row">
-            <a href={thisUrl}>
-              <h3 >Orchestrator Info</h3>
-              <Address address={thisID} />
-            </a>
+            <h3 >Orchestrator Info</h3>
+          </div>
+          <div className="row">
+            <Address address={thisID} />
           </div>
           {ensUrl}
           {ensDescription}
diff --git a/src/components/eventButtonAddress.js b/src/components/eventButtonAddress.js
index e22eccc..a15f26f 100644
--- a/src/components/eventButtonAddress.js
+++ b/src/components/eventButtonAddress.js
@@ -65,12 +65,12 @@ const EventButtonAddress = (obj) => {
     thisName = <h4 className="elipsText elipsOnMobileExtra">{thisInfo.domain}</h4>;
     if (thisInfo.avatar) {
       thisIcon =
-        <a className="selectOrch" style={{ cursor: 'alias' }} target="_blank" rel="noopener noreferrer" href={"https://app.ens.domains/name/" + thisInfo.domain + "/details"} >
+        <a className="selectOrch" style={{ padding: '0.2em', cursor: 'alias' }} target="_blank" rel="noopener noreferrer" href={"https://app.ens.domains/name/" + thisInfo.domain + "/details"} >
           <img alt="" src={thisInfo.avatar} width="20em" height="20em" style={{ margin: 0 }} />
         </a >
     } else {
       thisIcon =
-        <a className="selectOrch" style={{ cursor: 'alias' }} target="_blank" rel="noopener noreferrer" href={"https://app.ens.domains/name/" + thisInfo.domain + "/details"} >
+        <a className="selectOrch" style={{ padding: '0.2em', cursor: 'alias' }} target="_blank" rel="noopener noreferrer" href={"https://app.ens.domains/name/" + thisInfo.domain + "/details"} >
           <img alt="" src="ens.png" width="20em" height="20em" style={{ margin: 0 }} />
         </a >
     }
@@ -81,10 +81,10 @@ const EventButtonAddress = (obj) => {
 
   return (
     <div className="rowAlignLeft" style={{ width: '100%' }}>
-      {thisIcon}
-      <a className="selectOrch" style={{ cursor: 'alias' }} rel="noopener noreferrer" target="_blank" href={"https://explorer.livepeer.org/accounts/" + obj.address}>
+      <a className="selectOrch" style={{ padding: '0.2em', cursor: 'alias' }} rel="noopener noreferrer" target="_blank" href={"https://explorer.livepeer.org/accounts/" + obj.address}>
         <img alt="" src="livepeer.png" width="20em" height="20em" style={{ margin: 0 }} />
       </a>
+      {thisIcon}
       <button className="selectOrch" style={{ padding: '0.5em', cursor: 'pointer' }} onClick={() => { obj.setSearchTerm(obj.address) }} >
         <span className="elipsText">🔎</span>
       </button>
diff --git a/src/style.css b/src/style.css
index ab04aaa..2db8ac3 100644
--- a/src/style.css
+++ b/src/style.css
@@ -59,7 +59,6 @@ h2, h3, h1, h4, h5, h6 {
   white-space: nowrap;
   display: block;
   text-overflow: ellipsis;
-  width: 100%;
 }
 
 p {