diff --git a/blocks/agent-about/agent-about.css b/blocks/agent-about/agent-about.css
index 29fbbb77..96ab9dae 100644
--- a/blocks/agent-about/agent-about.css
+++ b/blocks/agent-about/agent-about.css
@@ -29,8 +29,7 @@
 }
 
 .agent-about.block>div.cols-1,
-.agent-about.block>div.cols-2,
-.agent-about.block>div.cols-3 {
+.agent-about.block>div.cols-2 {
   padding-bottom: 2rem;
 }
 
diff --git a/blocks/agent-address/agent-address.js b/blocks/agent-address/agent-address.js
index 187419f0..4cd12dee 100644
--- a/blocks/agent-address/agent-address.js
+++ b/blocks/agent-address/agent-address.js
@@ -4,18 +4,18 @@ import {
 } from '../../scripts/dom-helpers.js';
 
 export default function decorate(block) {
-  const streetAddress = getMetadata('streetaddress');
-  const addressLocality = getMetadata('addresslocality');
-  const addressRegion = getMetadata('addressregion');
-  const postalCode = getMetadata('postalcode');
+  const streetAddress = getMetadata('street-address');
+  const city = getMetadata('city');
+  const state = getMetadata('state');
+  const zip = getMetadata('zip');
 
   const textDiv = div({ class: 'address' },
     p('Berkshire Hathaway HomeServices'),
     p('Commonwealth Real Estate'),
     p(streetAddress),
-    p(`${addressLocality}, ${addressRegion} ${postalCode}`),
+    p(`${city}, ${state} ${zip}`),
   );
-  const text = `${streetAddress}, ${addressLocality}, ${addressRegion} ${postalCode}`;
+  const text = `${streetAddress}, ${city}, ${state} ${zip}`;
 
   const anchor = a({ href: `https://maps.google.com/maps?q=${text}`, target: '_blank' }, 'Directions');
   block.replaceChildren(textDiv, anchor);