diff --git a/src/components/Elements/MainModal/Main.jsx b/src/components/Elements/MainModal/Main.jsx
index c9a1c704..e91df9c5 100644
--- a/src/components/Elements/MainModal/Main.jsx
+++ b/src/components/Elements/MainModal/Main.jsx
@@ -24,7 +24,7 @@ function MainModal({ modalClose, deepLinkData }) {
   const [currentTab, setCurrentTab] = useState(initialTab);
   const [currentSection, setCurrentSection] = useState('');
   const [currentSectionName, setCurrentSectionName] = useState('');
-  const [currentSubSection, setCurrentSubSection] = useState(null);
+  const [currentSubSection, setCurrentSubSection] = useState(deepLinkData?.subSection || null);
   const [productView, setProductView] = useState(null);
   const [resetDiscoverToAll, setResetDiscoverToAll] = useState(false);
   const [navigationTrigger, setNavigationTrigger] = useState(null);
diff --git a/src/components/Elements/MainModal/components/ModalTopBar.jsx b/src/components/Elements/MainModal/components/ModalTopBar.jsx
index e4283319..053f89f3 100644
--- a/src/components/Elements/MainModal/components/ModalTopBar.jsx
+++ b/src/components/Elements/MainModal/components/ModalTopBar.jsx
@@ -164,26 +164,42 @@ function ModalTopBar({
           draggable={false}
         />
         {breadcrumbPath.length > 0 && (
-          <div className="breadcrumbs">
+          <nav className="breadcrumbs" aria-label="Breadcrumb navigation">
             {breadcrumbPath.map((item, index) => {
               const isLast = index === breadcrumbPath.length - 1;
               const isClickable = item.onClick !== null;
 
               return (
                 <span key={index} className="breadcrumb-segment">
-                  <span
-                    className={`breadcrumb-item ${isLast ? 'breadcrumb-current' : ''} ${
-                      isClickable ? 'breadcrumb-clickable' : ''
-                    }`}
-                    onClick={item.onClick}
-                  >
-                    {item.label}
-                  </span>
-                  {!isLast && <MdChevronRight className="breadcrumb-separator" />}
+                  {isClickable ? (
+                    <span
+                      className={`breadcrumb-item breadcrumb-clickable`}
+                      onClick={item.onClick}
+                      onKeyDown={(e) => {
+                        if (e.key === 'Enter' || e.key === ' ') {
+                          e.preventDefault();
+                          item.onClick();
+                        }
+                      }}
+                      role="button"
+                      tabIndex={0}
+                      aria-label={`Navigate to ${item.label}`}
+                    >
+                      {item.label}
+                    </span>
+                  ) : (
+                    <span
+                      className={`breadcrumb-item ${isLast ? 'breadcrumb-current' : ''}`}
+                      aria-current={isLast ? 'page' : undefined}
+                    >
+                      {item.label}
+                    </span>
+                  )}
+                  {!isLast && <MdChevronRight className="breadcrumb-separator" aria-hidden="true" />}
                 </span>
               );
             })}
-          </div>
+          </nav>
         )}
       </div>
       <div className="topBarRight">
diff --git a/src/components/Layout/Settings/Header/Header.jsx b/src/components/Layout/Settings/Header/Header.jsx
index b4f197cb..7e134afe 100644
--- a/src/components/Layout/Settings/Header/Header.jsx
+++ b/src/components/Layout/Settings/Header/Header.jsx
@@ -67,14 +67,6 @@ function Header(props) {
   return (
     <div className="modalHeader">
       <span className="mainTitle">
-        {props.secondaryTitle && (
-          <>
-            <span className="backTitle" onClick={props.goBack}>
-              {props.title}
-            </span>
-            <MdOutlineKeyboardArrowRight />
-          </>
-        )}
         {props.secondaryTitle || props.title}
       </span>
       <div className="headerActions">