diff --git a/client/src/components/shop-csi-config/shop-csi-config.component.jsx b/client/src/components/shop-csi-config/shop-csi-config.component.jsx
index c0b5801fb..72290660a 100644
--- a/client/src/components/shop-csi-config/shop-csi-config.component.jsx
+++ b/client/src/components/shop-csi-config/shop-csi-config.component.jsx
@@ -1,6 +1,6 @@
 import { CheckCircleFilled } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Col, List, Row } from "antd";
+import { Button, Card, Col, List, Row } from "antd";
 import { useState } from "react";
 
 import { useTranslation } from "react-i18next";
@@ -21,7 +21,7 @@ export default function ShopCsiConfig() {
   if (loading) return <LoadingSpinner />;
   if (error) return <AlertComponent title={error.message} type="error" />;
   return (
-    <div>
+    <Card>
       <Row>
         <Col span={3}>
           <List
@@ -41,6 +41,6 @@ export default function ShopCsiConfig() {
           <ShopCsiConfigForm selectedCsi={selectedCsi} />
         </Col>
       </Row>
-    </div>
+    </Card>
   );
 }
diff --git a/client/src/components/shop-info/shop-info.consent.component.jsx b/client/src/components/shop-info/shop-info.consent.component.jsx
index c9b0ca34d..28992e594 100644
--- a/client/src/components/shop-info/shop-info.consent.component.jsx
+++ b/client/src/components/shop-info/shop-info.consent.component.jsx
@@ -1,4 +1,4 @@
-import { Typography } from "antd";
+import { Card, Typography } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -15,10 +15,10 @@ function ShopInfoConsentComponent({ bodyshop }) {
   const { t } = useTranslation();
 
   return (
-    <div>
+    <Card>
       <Typography.Title level={4}>{t("settings.title")}</Typography.Title>
       {<PhoneNumberConsentList bodyshop={bodyshop} />}
-    </div>
+    </Card>
   );
 }
 
diff --git a/client/src/contexts/SocketIO/socketProvider.jsx b/client/src/contexts/SocketIO/socketProvider.jsx
index c7de27618..75b80d62f 100644
--- a/client/src/contexts/SocketIO/socketProvider.jsx
+++ b/client/src/contexts/SocketIO/socketProvider.jsx
@@ -312,7 +312,11 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
           scenario_meta: JSON.stringify(notifications.map((notif) => notif.variables || {})),
           created_at: new Date(notifications[0].timestamp).toISOString(),
           read: null,
-          job: { ro_number: jobRoNumber }
+          job: {
+            ro_number: jobRoNumber,
+            id: jobId,
+            __typename: "jobs"
+          }
         };
 
         const baseVariables = {
@@ -377,7 +381,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
             });
 
             notification.info({
-              message: (
+              title: (
                 <div
                   onClick={() => {
                     markNotificationRead({ variables: { id: notificationId } })
diff --git a/client/src/pages/dms/dms.container.jsx b/client/src/pages/dms/dms.container.jsx
index b802a4719..c4d5c8190 100644
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -363,7 +363,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
         }
       ]);
       notification.info({
-        message: "Reynolds RO created",
+        title: "Reynolds RO created",
         description:
           "Complete validation in Reynolds, then click Finished/Close to finalize and mark this export complete.",
         duration: 8