diff --git a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.styles.js b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.styles.js
index 18a1d49d..6ce6f04e 100644
--- a/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.styles.js
+++ b/new-lamassu-admin/src/components/booleanPropertiesTable/BooleanPropertiesTable.styles.js
@@ -46,9 +46,7 @@ const booleanPropertiesTableStyles = {
     flex: 'wrap'
   },
   rightAligned: {
-    display: 'flex',
-    position: 'absolute',
-    right: 0
+    marginLeft: 'auto'
   },
   radioButtons: {
     display: 'flex',
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js
index ae064e7f..cf2d8508 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js
+++ b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.js
@@ -73,120 +73,118 @@ const CoinATMRadar = memo(() => {
   if (!coinAtmRadarConfig) return null
 
   return (
-    <>
-      <div className={classes.rightAligned}>
-        <div className={classes.button}>
-          <a
-            target="_blank"
-            rel="noopener noreferrer"
-            href="https://coinatmradar.com/">
-            <Button>Coin ATM Radar page</Button>
-          </a>
+    <div className={classes.content}>
+      <div>
+        <div className={classes.rowWrapper}>
+          <H4>Coin ATM Radar share settings</H4>
+          <div className={classes.transparentButton}>
+            <button onClick={handleOpenHelpPopper}>
+              <HelpIcon />
+              <Popper
+                open={helpPopperOpen}
+                anchorEl={helpPopperAnchorEl}
+                placement="bottom"
+                onClose={handleCloseHelpPopper}>
+                <div className={classes.popoverContent}>
+                  <P>
+                    For details on configuring this panel, please read the
+                    relevant knowledgebase article{' '}
+                    <a
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      href="https://support.lamassu.is/hc/en-us/articles/360023720472-Coin-ATM-Radar">
+                      here
+                    </a>
+                    .
+                  </P>
+                </div>
+              </Popper>
+            </button>
+          </div>
         </div>
-      </div>
-      <div className={classes.rowWrapper}>
-        <H4>Coin ATM Radar share settings</H4>
-        <div className={classes.transparentButton}>
-          <button onClick={handleOpenHelpPopper}>
-            <HelpIcon />
-            <Popper
-              open={helpPopperOpen}
-              anchorEl={helpPopperAnchorEl}
-              placement="bottom"
-              onClose={handleCloseHelpPopper}>
-              <div className={classes.popoverContent}>
-                <P>
-                  For details on configuring this panel, please read the
-                  relevant knowledgebase article{' '}
-                  <a
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    href="https://support.lamassu.is/hc/en-us/articles/360023720472-Coin-ATM-Radar">
-                    here
-                  </a>
-                  .
-                </P>
-              </div>
-            </Popper>
-          </button>
+        <div className={classes.rowWrapper}>
+          <P>Share information?</P>
+          <div className={classes.switchWrapper}>
+            <Switch
+              checked={coinAtmRadarConfig.active}
+              onChange={event =>
+                save({
+                  active: event.target.checked
+                })
+              }
+            />
+          </div>
+          <Label2>{coinAtmRadarConfig.active ? 'Yes' : 'No'}</Label2>
         </div>
-      </div>
-      <div className={classes.rowWrapper}>
-        <P>Share information?</P>
-        <div className={classes.switchWrapper}>
-          <Switch
-            checked={coinAtmRadarConfig.active}
-            onChange={event =>
-              save({
-                active: event.target.checked
-              })
+        <BooleanPropertiesTable
+          title={'Machine info'}
+          disabled={!coinAtmRadarConfig.active}
+          data={coinAtmRadarConfig}
+          elements={[
+            // {
+            //   name: 'location',
+            //   display: 'Location',
+            //   value: coinAtmRadarConfig.location
+            // },
+            {
+              name: 'commissions',
+              display: 'Commissions',
+              value: coinAtmRadarConfig.commissions
+            },
+            {
+              name: 'supportedCryptocurrencies',
+              display: 'Supported Cryptocurrencies',
+              value: coinAtmRadarConfig.supportedCryptocurrencies
+            },
+            {
+              name: 'supportedFiat',
+              display: 'Supported Fiat',
+              value: coinAtmRadarConfig.supportedFiat
+            },
+            {
+              name: 'supportedBuySellDirection',
+              display: 'Supported Buy Sell Direction',
+              value: coinAtmRadarConfig.supportedBuySellDirection
+            },
+            {
+              name: 'limitsAndVerification',
+              display: 'Limits And Verification',
+              value: coinAtmRadarConfig.limitsAndVerification
             }
-          />
-        </div>
-        <Label2>{coinAtmRadarConfig.active ? 'Yes' : 'No'}</Label2>
+          ]}
+          save={save}
+        />
+        {/* <BooleanPropertiesTable
+          title={'Operator info'}
+          disabled={!coinAtmRadarConfig.active}
+          data={coinAtmRadarConfig}
+          elements={[
+            {
+              name: 'operatorName',
+              display: 'Operator Name',
+              value: coinAtmRadarConfig.operatorName
+            },
+            {
+              name: 'operatorPhoneNumber',
+              display: 'Operator Phone Number',
+              value: coinAtmRadarConfig.operatorPhoneNumber
+            },
+            {
+              name: 'operatorEmail',
+              display: 'Operator Email',
+              value: coinAtmRadarConfig.operatorEmail
+            }
+          ]}
+          save={save}
+        /> */}
       </div>
-      <BooleanPropertiesTable
-        title={'Machine info'}
-        disabled={!coinAtmRadarConfig.active}
-        data={coinAtmRadarConfig}
-        elements={[
-          // {
-          //   name: 'location',
-          //   display: 'Location',
-          //   value: coinAtmRadarConfig.location
-          // },
-          {
-            name: 'commissions',
-            display: 'Commissions',
-            value: coinAtmRadarConfig.commissions
-          },
-          {
-            name: 'supportedCryptocurrencies',
-            display: 'Supported Cryptocurrencies',
-            value: coinAtmRadarConfig.supportedCryptocurrencies
-          },
-          {
-            name: 'supportedFiat',
-            display: 'Supported Fiat',
-            value: coinAtmRadarConfig.supportedFiat
-          },
-          {
-            name: 'supportedBuySellDirection',
-            display: 'Supported Buy Sell Direction',
-            value: coinAtmRadarConfig.supportedBuySellDirection
-          },
-          {
-            name: 'limitsAndVerification',
-            display: 'Limits And Verification',
-            value: coinAtmRadarConfig.limitsAndVerification
-          }
-        ]}
-        save={save}
-      />
-      {/* <BooleanPropertiesTable
-        title={'Operator info'}
-        disabled={!coinAtmRadarConfig.active}
-        data={coinAtmRadarConfig}
-        elements={[
-          {
-            name: 'operatorName',
-            display: 'Operator Name',
-            value: coinAtmRadarConfig.operatorName
-          },
-          {
-            name: 'operatorPhoneNumber',
-            display: 'Operator Phone Number',
-            value: coinAtmRadarConfig.operatorPhoneNumber
-          },
-          {
-            name: 'operatorEmail',
-            display: 'Operator Email',
-            value: coinAtmRadarConfig.operatorEmail
-          }
-        ]}
-        save={save}
-      /> */}
-    </>
+      <a
+        target="_blank"
+        rel="noopener noreferrer"
+        href="https://coinatmradar.com/">
+        <Button>Coin ATM Radar page</Button>
+      </a>
+    </div>
   )
 })
 
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.styles.js b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.styles.js
index ab0302d2..87ebc71b 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.styles.js
+++ b/new-lamassu-admin/src/pages/OperatorInfo/CoinATMRadar/CoinATMRadar.styles.js
@@ -2,10 +2,14 @@ import baseStyles from 'src/pages/Logs.styles'
 import { booleanPropertiesTableStyles } from 'src/components/booleanPropertiesTable/BooleanPropertiesTable.styles'
 
 const { button } = baseStyles
-const { rowWrapper, rightAligned } = booleanPropertiesTableStyles
+const { rowWrapper } = booleanPropertiesTableStyles
 
 const mainStyles = {
   button,
+  content: {
+    display: 'flex',
+    justifyContent: 'space-between'
+  },
   transparentButton: {
     '& > *': {
       margin: 'auto 15px'
@@ -21,7 +25,6 @@ const mainStyles = {
     display: 'flex',
     marginLeft: 120
   },
-  rightAligned,
   popoverContent: {
     width: 272,
     padding: [[10, 15]]
diff --git a/new-lamassu-admin/src/pages/OperatorInfo/OperatorInfo.js b/new-lamassu-admin/src/pages/OperatorInfo/OperatorInfo.js
index 23fe645b..dcdfa80c 100644
--- a/new-lamassu-admin/src/pages/OperatorInfo/OperatorInfo.js
+++ b/new-lamassu-admin/src/pages/OperatorInfo/OperatorInfo.js
@@ -13,6 +13,7 @@ import TermsConditions from './TermsConditions'
 
 const localStyles = {
   contentWrapper: {
+    width: '100%',
     marginLeft: 48,
     paddingTop: 15
   }