diff --git a/application/frontend/src/pages/Explorer/explorer.scss b/application/frontend/src/pages/Explorer/explorer.scss
index 9d94aab22..d910690e8 100644
--- a/application/frontend/src/pages/Explorer/explorer.scss
+++ b/application/frontend/src/pages/Explorer/explorer.scss
@@ -21,19 +21,40 @@ main#explorer-content {
     color: #0056b3;
   }
 
-  .search-field {
-    input {
-      font-size: 16px;
-      height: 32px;
-      width: 320px;
+  .search-field {
+    input {
+      font-size: 16px;
+      height: 32px;
+      width: 320px;
       margin-bottom: 10px;
       border-radius: 3px;
       border: 1px solid #858585;
       padding: 0 5px;
       color: #333333;
-      background-color: #ffffff;
-    }
-  }
+      background-color: #ffffff;
+    }
+  }
+
+  .tree-actions {
+    display: flex;
+    gap: 10px;
+    margin-bottom: 14px;
+
+    button {
+      height: 34px;
+      padding: 0 12px;
+      border: 1px solid #b1b0b0;
+      border-radius: 4px;
+      background: #ffffff;
+      color: #1a202c;
+      cursor: pointer;
+      font-size: 14px;
+
+      &:hover {
+        background: #f4f6f8;
+      }
+    }
+  }
 
   #graphs-menu {
     display: flex;
@@ -150,16 +171,20 @@ main#explorer-content {
     padding: 1rem;
     /* Reduce from 30px to prevent content touching edges */
 
-    .search-field {
-      input {
-        width: 100%;
-        /* Expand from fixed 320px - overflows on small screens */
-      }
-    }
-
-    .item {
-      margin: 4px 4px 4px 1rem;
-      /* Reduce from 40px left margin on mobile */
+    .search-field {
+      input {
+        width: 100%;
+        /* Expand from fixed 320px - overflows on small screens */
+      }
+    }
+
+    .tree-actions {
+      flex-wrap: wrap;
+    }
+
+    .item {
+      margin: 4px 4px 4px 1rem;
+      /* Reduce from 40px left margin on mobile */
     }
   }
-}
\ No newline at end of file
+}
diff --git a/application/frontend/src/pages/Explorer/explorer.tsx b/application/frontend/src/pages/Explorer/explorer.tsx
index 64bee6566..a54e484c2 100644
--- a/application/frontend/src/pages/Explorer/explorer.tsx
+++ b/application/frontend/src/pages/Explorer/explorer.tsx
@@ -65,6 +65,32 @@ export const Explorer = () => {
     }
   };
 
+  const collectExpandableIds = (nodes: TreeDocument[] = []): string[] => {
+    const ids: string[] = [];
+
+    const visit = (node: TreeDocument | null) => {
+      if (!node) {
+        return;
+      }
+      const contains = (node.links || []).filter((link) => link.ltype === TYPE_CONTAINS);
+      if (contains.length > 0) {
+        ids.push(node.id);
+        contains.forEach((child) => visit(child.document));
+      }
+    };
+
+    nodes.forEach((node) => visit(node));
+    return ids;
+  };
+
+  const collapseAll = () => {
+    setCollapsedItems(collectExpandableIds(filteredTree || []));
+  };
+
+  const expandAll = () => {
+    setCollapsedItems([]);
+  };
+
   useEffect(() => {
     if (dataTree.length) {
       const treeCopy = structuredClone(dataTree);
@@ -136,11 +162,7 @@ export const Explorer = () => {
         <h1>Open CRE Explorer</h1>
         <p>
           A visual explorer of Open Common Requirement Enumerations (CREs). Originally created by:{' '}
-          <a
-            target="_blank"
-            rel="noopener noreferrer"
-            href="https://zeljkoobrenovic.github.io/opencre-explorer/"
-          >
+          <a target="_blank" rel="noopener noreferrer" href="https://zeljkoobrenovic.github.io/opencre-explorer/">
             Zeljko Obrenovic
           </a>
           .
@@ -151,6 +173,14 @@ export const Explorer = () => {
             <input id="filter" type="text" placeholder="Search Explorer..." onKeyUp={update} />
             <div id="search-summary"></div>
           </div>
+          <div className="tree-actions">
+            <button type="button" onClick={expandAll}>
+              Expand all
+            </button>
+            <button type="button" onClick={collapseAll}>
+              Collapse all
+            </button>
+          </div>
           <div id="graphs-menu">
             <h4 className="menu-title">Explore visually:</h4>
             <ul>
diff --git a/application/frontend/src/pages/GapAnalysis/GapAnalysis.scss b/application/frontend/src/pages/GapAnalysis/GapAnalysis.scss
index feccf0672..8f4c573b0 100644
--- a/application/frontend/src/pages/GapAnalysis/GapAnalysis.scss
+++ b/application/frontend/src/pages/GapAnalysis/GapAnalysis.scss
@@ -5,6 +5,23 @@ main#gap-analysis {
   span.name {
     padding: 0 10px;
   }
+
+  .specialized-cheatsheets {
+    margin-top: 1.5rem;
+
+    h2 {
+      margin-bottom: 0.4rem;
+    }
+
+    p {
+      margin-bottom: 0.9rem;
+      color: #4a5568;
+    }
+
+    table {
+      border-top: 3px solid #2b6cb0;
+    }
+  }
 }
 
 @media (min-width: 0px) and (max-width: 500px) {
diff --git a/application/frontend/src/pages/GapAnalysis/GapAnalysis.tsx b/application/frontend/src/pages/GapAnalysis/GapAnalysis.tsx
index 1a0a72c38..1bc72a4e4 100644
--- a/application/frontend/src/pages/GapAnalysis/GapAnalysis.tsx
+++ b/application/frontend/src/pages/GapAnalysis/GapAnalysis.tsx
@@ -8,19 +8,48 @@ import { Button, Dropdown, DropdownItemProps, Icon, Popup, Table } from 'semanti
 import { LoadingAndErrorIndicator } from '../../components/LoadingAndErrorIndicator';
 import { GA_STRONG_UPPER_LIMIT } from '../../const';
 import { useEnvironment } from '../../hooks';
-import { GapAnalysisPathStart } from '../../types';
+import { GapAnalysisPathStart, OwaspTop10Comparison, SpecializedCheatsheetSection } from '../../types';
 import { getDocumentDisplayName } from '../../utils';
 import { getInternalUrl } from '../../utils/document';
 
-const GetSegmentText = (segment, segmentID) => {
+const documentsMatch = (left, right) => {
+  if (!left || !right) return false;
+  if (left.id && right.id) return left.id === right.id;
+
+  return (
+    left.doctype === right.doctype &&
+    left.name === right.name &&
+    left.version === right.version &&
+    left.sectionID === right.sectionID &&
+    left.section === right.section &&
+    left.subsection === right.subsection
+  );
+};
+
+const GetSegmentText = (segment, currentDocument) => {
   let textPart = segment.end;
-  let nextID = segment.end.id;
+  let nextDocument = segment.end;
   let arrow = <Icon name="arrow down" />;
-  if (segmentID !== segment.start.id) {
+
+  if (documentsMatch(currentDocument, segment.start)) {
+    textPart = segment.end;
+    nextDocument = segment.end;
+  } else if (documentsMatch(currentDocument, segment.end)) {
     textPart = segment.start;
-    nextID = segment.start.id;
+    nextDocument = segment.start;
+    arrow = <Icon name="arrow up" />;
+  } else if (currentDocument?.doctype !== 'CRE') {
+    if (segment.start.doctype === 'CRE' && segment.end.doctype !== 'CRE') {
+      textPart = segment.start;
+      nextDocument = segment.start;
+      arrow = <Icon name="arrow up" />;
+    }
+  } else if (segment.end.doctype === 'CRE' && segment.start.doctype !== 'CRE') {
+    textPart = segment.start;
+    nextDocument = segment.start;
     arrow = <Icon name="arrow up" />;
   }
+
   const text = (
     <>
       <br />
@@ -28,11 +57,10 @@ const GetSegmentText = (segment, segmentID) => {
       <span style={{ textTransform: 'capitalize' }}>
         {segment.relationship.replace('_', ' ').toLowerCase()} {segment.score > 0 && <> (+{segment.score})</>}
       </span>
-      <br /> {getDocumentDisplayName(textPart, true)} {textPart.section ?? ''} {textPart.subsection ?? ''}{' '}
-      {textPart.description ?? ''}
+      <br /> {getDocumentDisplayName(textPart, true)} {textPart.doctype === 'CRE' ? textPart.description ?? '' : ''}
     </>
   );
-  return { text, nextID };
+  return { text, nextDocument };
 };
 
 function useQuery() {
@@ -41,8 +69,23 @@ function useQuery() {
   return React.useMemo(() => new URLSearchParams(search), [search]);
 }
 
+const getInitialStandardsFromQuery = (searchParams: URLSearchParams) => {
+  const standardParams = searchParams.getAll('standard').filter(Boolean);
+  if (standardParams.length >= 2) {
+    return {
+      base: standardParams[0],
+      compare: standardParams[1],
+    };
+  }
+
+  return {
+    base: searchParams.get('base') ?? '',
+    compare: searchParams.get('compare') ?? '',
+  };
+};
+
 const GetStrength = (score) => {
-  if (score == 0) return 'Direct';
+  if (score == 0) return 'Shared CRE';
   if (score <= GA_STRONG_UPPER_LIMIT) return 'Strong';
   if (score >= 7) return 'Weak';
   return 'Average';
@@ -55,8 +98,39 @@ const GetStrengthColor = (score) => {
   return 'Orange';
 };
 
-const GetResultLine = (path, gapAnalysis, key) => {
-  let segmentID = gapAnalysis[key].start.id;
+const CHEATSHEET_CATEGORY_LABELS = {
+  'LLM Prompt Injection Prevention Cheat Sheet': 'AI',
+  'AI Agent Security Cheat Sheet': 'AI',
+  'Secure AI Model Ops Cheat Sheet': 'AI',
+  'REST Security Cheat Sheet': 'API',
+  'Authorization Cheat Sheet': 'API',
+  'Server Side Request Forgery Prevention Cheat Sheet': 'API',
+  'Web Service Security Cheat Sheet': 'API',
+  'Docker Security Cheat Sheet': 'Cloud',
+  'Kubernetes Security Cheat Sheet': 'Cloud',
+  'Secure Cloud Architecture Cheat Sheet': 'Cloud',
+};
+
+const formatCheatsheetLabel = (document, specializedCategory?: string) => {
+  if (document?.name !== 'OWASP Cheat Sheets') {
+    return getDocumentDisplayName(document, true);
+  }
+
+  const category =
+    CHEATSHEET_CATEGORY_LABELS[document.section] ??
+    (specializedCategory?.includes('AI')
+      ? 'AI'
+      : specializedCategory?.includes('API')
+      ? 'API'
+      : specializedCategory?.includes('Cloud')
+      ? 'Cloud'
+      : 'Web');
+
+  return `${category} Cheat Sheet: ${document.section}`;
+};
+
+const GetResultLine = (path, gapAnalysis, key, specializedCategory?: string) => {
+  let currentDocument = gapAnalysis[key].start;
   return (
     <div key={path.end.id} style={{ marginBottom: '.25em', fontWeight: 'bold' }}>
       <a href={getInternalUrl(path.end)} target="_blank" rel="noopener noreferrer">
@@ -66,13 +140,13 @@ const GetResultLine = (path, gapAnalysis, key) => {
           style={{ textAlign: 'center' }}
           hoverable
           position="right center"
-          trigger={<span>{getDocumentDisplayName(path.end, true)} </span>}
+          trigger={<span>{formatCheatsheetLabel(path.end, specializedCategory)} </span>}
         >
           <Popup.Content>
             {getDocumentDisplayName(gapAnalysis[key].start, true)}
             {path.path.map((segment) => {
-              const { text, nextID } = GetSegmentText(segment, segmentID);
-              segmentID = nextID;
+              const { text, nextDocument } = GetSegmentText(segment, currentDocument);
+              currentDocument = nextDocument;
               return text;
             })}
           </Popup.Content>
@@ -92,7 +166,7 @@ const GetResultLine = (path, gapAnalysis, key) => {
           <Popup.Content>
             <b>Generally: lower is better</b>
             <br />
-            <b style={{ color: GetStrengthColor(0) }}>{GetStrength(0)}</b>: Directly Linked
+            <b style={{ color: GetStrengthColor(0) }}>{GetStrength(0)}</b>: Standards share a directly linked CRE
             <br />
             <b style={{ color: GetStrengthColor(GA_STRONG_UPPER_LIMIT) }}>
               {GetStrength(GA_STRONG_UPPER_LIMIT)}
@@ -114,15 +188,17 @@ const GetResultLine = (path, gapAnalysis, key) => {
 export const GapAnalysis = () => {
   const standardOptionsDefault = [{ key: '', text: '', value: undefined }];
   const searchParams = useQuery();
+  const initialStandards = getInitialStandardsFromQuery(searchParams);
   const [standardOptions, setStandardOptions] = useState<DropdownItemProps[] | undefined>(
     standardOptionsDefault
   );
-  const [BaseStandard, setBaseStandard] = useState<string | undefined>(searchParams.get('base') ?? '');
-  const [CompareStandard, setCompareStandard] = useState<string | undefined>(
-    searchParams.get('compare') ?? ''
-  );
+  const [BaseStandard, setBaseStandard] = useState<string | undefined>(initialStandards.base);
+  const [CompareStandard, setCompareStandard] = useState<string | undefined>(initialStandards.compare);
   const [gaJob, setgaJob] = useState<string>('');
   const [gapAnalysis, setGapAnalysis] = useState<Record<string, GapAnalysisPathStart>>();
+  const [owaspComparison, setOwaspComparison] = useState<OwaspTop10Comparison>();
+  const [specializedCheatsheetSection, setSpecializedCheatsheetSection] =
+    useState<SpecializedCheatsheetSection>();
   const [loadingStandards, setLoadingStandards] = useState<boolean>(false);
   const [loadingGA, setLoadingGA] = useState<boolean>(false);
   const [error, setError] = useState<string | null | object>(null);
@@ -158,6 +234,7 @@ export const GapAnalysis = () => {
         if (result.data.result) {
           setLoadingGA(false);
           setGapAnalysis(result.data.result);
+          setSpecializedCheatsheetSection(result.data.specialized_cheatsheet_section);
           setgaJob('');
         }
       };
@@ -197,6 +274,13 @@ export const GapAnalysis = () => {
       if (result.data.result) {
         setLoadingGA(false);
         setGapAnalysis(result.data.result);
+        setOwaspComparison(result.data.owasp_top10_comparison);
+        setSpecializedCheatsheetSection(result.data.specialized_cheatsheet_section);
+      } else if (result.data.owasp_top10_comparison) {
+        setLoadingGA(false);
+        setGapAnalysis(undefined);
+        setOwaspComparison(result.data.owasp_top10_comparison);
+        setSpecializedCheatsheetSection(result.data.specialized_cheatsheet_section);
       } else if (result.data.job_id) {
         setgaJob(result.data.job_id);
       }
@@ -204,6 +288,8 @@ export const GapAnalysis = () => {
 
     if (!BaseStandard || !CompareStandard || BaseStandard === CompareStandard) return;
     setGapAnalysis(undefined);
+    setOwaspComparison(undefined);
+    setSpecializedCheatsheetSection(undefined);
     setLoadingGA(true);
     fetchData().catch((e) => {
       setLoadingGA(false);
@@ -282,7 +368,7 @@ export const GapAnalysis = () => {
           </Table.Row>
         </Table.Header>
         <Table.Body>
-          {gapAnalysis && (
+          {gapAnalysis && !specializedCheatsheetSection && (
             <>
               {Object.keys(gapAnalysis)
                 .sort((a, b) =>
@@ -326,6 +412,110 @@ export const GapAnalysis = () => {
           )}
         </Table.Body>
       </Table>
+      {specializedCheatsheetSection && (
+        <div className="specialized-cheatsheets">
+          <h2>{specializedCheatsheetSection.category}</h2>
+          <p>
+            Showing only the specialized OWASP Cheat Sheets for this comparison so the results stay focused.
+          </p>
+          <Table celled padded compact>
+            <Table.Body>
+              {Object.keys(specializedCheatsheetSection.result)
+                .sort((a, b) =>
+                  getDocumentDisplayName(
+                    specializedCheatsheetSection.result[a].start,
+                    true
+                  ).localeCompare(
+                    getDocumentDisplayName(
+                      specializedCheatsheetSection.result[b].start,
+                      true
+                    )
+                  )
+                )
+                .map((key) => (
+                  <Table.Row key={key}>
+                    <Table.Cell textAlign="left" verticalAlign="top" selectable>
+                      <a
+                        href={getInternalUrl(specializedCheatsheetSection.result[key].start)}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                      >
+                        <p>
+                          <b>{getDocumentDisplayName(specializedCheatsheetSection.result[key].start, true)}</b>
+                        </p>
+                      </a>
+                    </Table.Cell>
+                    <Table.Cell style={{ minWidth: '35vw' }}>
+                      {Object.values<any>(specializedCheatsheetSection.result[key].paths)
+                        .sort((a, b) => a.score - b.score)
+                        .map((path) =>
+                          GetResultLine(
+                            path,
+                            specializedCheatsheetSection.result,
+                            key,
+                            specializedCheatsheetSection.category
+                          )
+                        )}
+                      {specializedCheatsheetSection.result[key].weakLinks &&
+                        Object.values<any>(specializedCheatsheetSection.result[key].weakLinks)
+                          .sort((a, b) => a.score - b.score)
+                          .map((path) =>
+                            GetResultLine(
+                              path,
+                              specializedCheatsheetSection.result,
+                              key,
+                              specializedCheatsheetSection.category
+                            )
+                          )}
+                      {Object.keys(specializedCheatsheetSection.result[key].paths).length === 0 &&
+                        specializedCheatsheetSection.result[key].extra === 0 && <i>No links Found</i>}
+                    </Table.Cell>
+                  </Table.Row>
+                ))}
+            </Table.Body>
+          </Table>
+        </div>
+      )}
+      {owaspComparison && (
+        <Table celled padded compact style={{ marginTop: '2rem' }}>
+          <Table.Header>
+            <Table.Row>
+              <Table.HeaderCell width={2}>Rank</Table.HeaderCell>
+              <Table.HeaderCell width={6}>OWASP Top 10 2021</Table.HeaderCell>
+              <Table.HeaderCell width={6}>OWASP Top 10 2025</Table.HeaderCell>
+              <Table.HeaderCell width={2}>Changed</Table.HeaderCell>
+            </Table.Row>
+          </Table.Header>
+          <Table.Body>
+            {owaspComparison.items.map((item) => (
+              <Table.Row key={item.rank}>
+                <Table.Cell>
+                  <b>{item.rank}</b>
+                </Table.Cell>
+                <Table.Cell>
+                  {item.top10_2021?.hyperlink ? (
+                    <a href={item.top10_2021.hyperlink} target="_blank" rel="noopener noreferrer">
+                      {item.top10_2021.section}
+                    </a>
+                  ) : (
+                    item.top10_2021?.section ?? <i>Not mapped</i>
+                  )}
+                </Table.Cell>
+                <Table.Cell>
+                  {item.top10_2025?.hyperlink ? (
+                    <a href={item.top10_2025.hyperlink} target="_blank" rel="noopener noreferrer">
+                      {item.top10_2025.section}
+                    </a>
+                  ) : (
+                    item.top10_2025?.section ?? <i>Not mapped</i>
+                  )}
+                </Table.Cell>
+                <Table.Cell>{item.changed ? 'Yes' : 'No'}</Table.Cell>
+              </Table.Row>
+            ))}
+          </Table.Body>
+        </Table>
+      )}
     </main>
   );
 };
diff --git a/application/frontend/src/providers/DataProvider.tsx b/application/frontend/src/providers/DataProvider.tsx
index 37962c014..aaa0cb738 100644
--- a/application/frontend/src/providers/DataProvider.tsx
+++ b/application/frontend/src/providers/DataProvider.tsx
@@ -9,8 +9,9 @@ import { Document, TreeDocument } from '../types';
 import { getDbObject, setDbObject } from '../utils'; // Assumes utils/index.tsx is the entry point
 import { getInternalUrl, getTopicDisplayName } from '../utils/document';
 
-const DATA_STORE_KEY = 'data-store',
-  DATA_TREE_KEY = 'record-tree';
+const CACHE_VERSION = 'v2';
+const DATA_STORE_KEY = `data-store-${CACHE_VERSION}`,
+  DATA_TREE_KEY = `record-tree-${CACHE_VERSION}`;
 
 type DataContextValues = {
   dataLoading: boolean;
@@ -84,7 +85,7 @@ export const DataProvider = ({ children }: { children: React.ReactNode }) => {
   const getTreeQuery = useQuery(
     'root_cres',
     async () => {
-      if (!dataTree.length && Object.keys(dataStore).length) {
+      if (Object.keys(dataStore).length) {
         try {
           const result = await axios.get(`${apiUrl}/root_cres`);
           const treeData = result.data.data.map((x) => buildTree(x));
@@ -108,32 +109,30 @@ export const DataProvider = ({ children }: { children: React.ReactNode }) => {
   const getStoreQuery = useQuery(
     'all_cres',
     async () => {
-      if (!Object.keys(dataStore).length) {
-        try {
-          const result = await axios.get(`${apiUrl}/all_cres?page=1&per_page=1000`);
-          let data = result.data.data;
-          let store = {};
-
-          if (data.length) {
-            data.forEach((x) => {
-              store[getStoreKey(x)] = {
-                links: x.links,
-                displayName: getTopicDisplayName(x),
-                url: getInternalUrl(x),
-                ...x,
-              };
-            });
-
-            // CHANGE 5: Save to IndexedDB (async) instead of localStorage
-            await setDbObject(DATA_STORE_KEY, store, TWO_DAYS_MILLISECONDS);
-
-            setDataStore(store);
-            console.log('retrieved all cres');
-          }
-        } catch (error) {
-          console.error('Could not retrieve CREs error:');
-          console.error(error);
+      try {
+        const result = await axios.get(`${apiUrl}/all_cres?page=1&per_page=1000`);
+        let data = result.data.data;
+        let store = {};
+
+        if (data.length) {
+          data.forEach((x) => {
+            store[getStoreKey(x)] = {
+              links: x.links,
+              displayName: getTopicDisplayName(x),
+              url: getInternalUrl(x),
+              ...x,
+            };
+          });
+
+          // CHANGE 5: Save to IndexedDB (async) instead of localStorage
+          await setDbObject(DATA_STORE_KEY, store, TWO_DAYS_MILLISECONDS);
+
+          setDataStore(store);
+          console.log('retrieved all cres');
         }
+      } catch (error) {
+        console.error('Could not retrieve CREs error:');
+        console.error(error);
       }
     },
     {
diff --git a/application/frontend/src/types.ts b/application/frontend/src/types.ts
index 3b050b633..ec7ece9f7 100644
--- a/application/frontend/src/types.ts
+++ b/application/frontend/src/types.ts
@@ -39,6 +39,30 @@ export interface GapAnalysisPathStart {
   weakLinks: Record<string, GapAnalysisPath>;
 }
 
+export interface OwaspTop10ComparisonItemEntry {
+  hyperlink?: string;
+  section: string;
+  section_id: string;
+}
+
+export interface OwaspTop10ComparisonItem {
+  rank: string;
+  changed: boolean;
+  top10_2021?: OwaspTop10ComparisonItemEntry;
+  top10_2025?: OwaspTop10ComparisonItemEntry;
+}
+
+export interface OwaspTop10Comparison {
+  standards: string[];
+  items: OwaspTop10ComparisonItem[];
+}
+
+export interface SpecializedCheatsheetSection {
+  category: string;
+  standards: string[];
+  result: Record<string, GapAnalysisPathStart>;
+}
+
 export interface TreeDocument extends Document {
   displayName: string;
   url: string;
diff --git a/application/frontend/src/utils/document.ts b/application/frontend/src/utils/document.ts
index bf01714b5..e0c1b81e0 100644
--- a/application/frontend/src/utils/document.ts
+++ b/application/frontend/src/utils/document.ts
@@ -11,12 +11,10 @@ export const getDocumentDisplayName = (document: Document, noID = false) => {
   if (!document) {
     return '';
   }
-  if (document.doctype != DOCUMENT_TYPES.TYPE_CRE) {
-    document.id = '';
-  }
+  const displayID = document.doctype != DOCUMENT_TYPES.TYPE_CRE ? '' : document.id;
   return [
     document.doctype,
-    noID ? '' : document.id,
+    noID ? '' : displayID,
     document.name,
     document.version,
     document.sectionID,