diff --git a/src/scss/components/_chat.scss b/src/scss/components/_chat.scss
index 956c401..ba86d82 100644
--- a/src/scss/components/_chat.scss
+++ b/src/scss/components/_chat.scss
@@ -209,4 +209,8 @@
   gap: $space-4;
   width: 100%;
   max-width: 720px;
+  padding: $space-3;
+  border: 1px solid $neutral-100;
+  border-radius: $radius-lg;
+  background-color: $neutral-50;
 }
diff --git a/src/scss/components/_data-row.scss b/src/scss/components/_data-row.scss
index b365d3c..c55aae4 100644
--- a/src/scss/components/_data-row.scss
+++ b/src/scss/components/_data-row.scss
@@ -79,6 +79,7 @@
 }
 
 .data-row-label {
+  margin-bottom: $space-1;
   color: $neutral-500;
   font-size: $font-size-xs;
   font-weight: $font-weight-semibold;
@@ -111,6 +112,7 @@
   border: 1px solid $neutral-200;
   border-radius: $radius-lg;
   overflow: hidden;
+  background-color: $neutral-0;
 }
 
 @media (max-width: 640px) {
diff --git a/src/scss/components/_option-card.scss b/src/scss/components/_option-card.scss
index 42483d9..ddea6a8 100644
--- a/src/scss/components/_option-card.scss
+++ b/src/scss/components/_option-card.scss
@@ -152,7 +152,7 @@
 .option-card-body {
   display: flex;
   flex-direction: column;
-  gap: $space-3;
+  gap: $space-2;
   padding: $space-4;
 }
 
@@ -192,13 +192,14 @@
   display: flex;
   flex-wrap: wrap;
   gap: $space-2;
+  padding-top: $space-1;
 }
 
 .option-card-actions {
   display: flex;
   align-items: center;
   gap: $space-3;
-  padding-top: $space-2;
+  padding-top: $space-3;
 }
 
 .option-card-details {
diff --git a/tests/demo-screenshot.spec.js b/tests/demo-screenshot.spec.js
index e254063..898064b 100644
--- a/tests/demo-screenshot.spec.js
+++ b/tests/demo-screenshot.spec.js
@@ -44,7 +44,8 @@
   { name: "chips", label: "Chips" },
   { name: "avatar", label: "Avatar" },
   { name: "skeleton", label: "Skeleton" },
-  { name: "navigation-shell", label: "Navigation Shell" }
+  { name: "navigation-shell", label: "Navigation Shell" },
+  { name: "option-card-chat", label: "Option Card & Chat" }
 ];
 
 test.describe("@screenshot", () => {