diff --git a/crates/sui-json-rpc-types/src/sui_transaction.rs b/crates/sui-json-rpc-types/src/sui_transaction.rs
index 67859f5591354..d67345aa35db1 100644
--- a/crates/sui-json-rpc-types/src/sui_transaction.rs
+++ b/crates/sui-json-rpc-types/src/sui_transaction.rs
@@ -2345,7 +2345,7 @@ impl From<EffectsWithInput> for SuiTransactionBlockEffects {
 #[serde_as]
 #[derive(Clone, Debug, JsonSchema, Serialize, Deserialize)]
 pub enum TransactionFilter {
-    /// Query by checkpoint.
+    /// CURRENTLY NOT SUPPORTED. Query by checkpoint.
     Checkpoint(
         #[schemars(with = "BigInt<u64>")]
         #[serde_as(as = "Readable<BigInt<u64>, _>")]
@@ -2369,7 +2369,7 @@ pub enum TransactionFilter {
     ToAddress(SuiAddress),
     /// Query by sender and recipient address.
     FromAndToAddress { from: SuiAddress, to: SuiAddress },
-    /// Query txs that have a given address as sender or recipient.
+    /// CURRENTLY NOT SUPPORTED. Query txs that have a given address as sender or recipient.
     FromOrToAddress { addr: SuiAddress },
     /// Query by transaction kind
     TransactionKind(String),
diff --git a/crates/sui-open-rpc/spec/openrpc.json b/crates/sui-open-rpc/spec/openrpc.json
index de8467490bdab..26f66bbd1f1a9 100644
--- a/crates/sui-open-rpc/spec/openrpc.json
+++ b/crates/sui-open-rpc/spec/openrpc.json
@@ -10724,7 +10724,7 @@
       "TransactionFilter": {
         "oneOf": [
           {
-            "description": "Query by checkpoint.",
+            "description": "CURRENTLY NOT SUPPORTED. Query by checkpoint.",
             "type": "object",
             "required": [
               "Checkpoint"
@@ -10860,7 +10860,7 @@
             "additionalProperties": false
           },
           {
-            "description": "Query txs that have a given address as sender or recipient.",
+            "description": "CURRENTLY NOT SUPPORTED. Query txs that have a given address as sender or recipient.",
             "type": "object",
             "required": [
               "FromOrToAddress"
diff --git a/docs/site/src/components/API/api-ref/compnav.js b/docs/site/src/components/API/api-ref/compnav.js
new file mode 100644
index 0000000000000..03009d56a5984
--- /dev/null
+++ b/docs/site/src/components/API/api-ref/compnav.js
@@ -0,0 +1,29 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import React from "react";
+import Link from "@docusaurus/Link";
+
+const CompNav = (props) => {
+  const { json, apis } = props;
+
+  return (
+    <div className="mb-32">
+      <div>
+        <h2>Component schemas</h2>
+        {Object.keys(json["components"]["schemas"]).map((component) => {
+          return (
+          <div key={component}>
+            <Link href={`#${component.toLowerCase()}`}
+            data-to-scrollspy-id={`${component.toLowerCase()}`}
+            className="my-1 pl-4 block text-sui-gray-95 dark:text-sui-grey-35 hover:no-underline dark:hover:text-sui-blue">
+              {component}
+            </Link>
+            </div>
+        )})}      
+      </div>
+    </div>
+  );
+};
+
+export default CompNav;
diff --git a/docs/site/src/components/API/api-ref/components.js b/docs/site/src/components/API/api-ref/components.js
new file mode 100644
index 0000000000000..c95234a23d486
--- /dev/null
+++ b/docs/site/src/components/API/api-ref/components.js
@@ -0,0 +1,326 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import React, { useRef } from "react";
+import Link from "@docusaurus/Link";
+import Markdown from "markdown-to-jsx";
+import { Light as SyntaxHighlighter } from "react-syntax-highlighter";
+import js from "react-syntax-highlighter/dist/esm/languages/hljs/json";
+import docco from "react-syntax-highlighter/dist/esm/styles/hljs/docco";
+import dark from "react-syntax-highlighter/dist/esm/styles/hljs/dracula";
+import ScrollSpy from "react-ui-scrollspy";
+
+SyntaxHighlighter.registerLanguage("json", js);
+
+const pillStyle =
+  "p-2 border border-solid border-sui-blue-dark rounded-lg max-w-max bg-sui-ghost-white dark:bg-sui-gray-90";
+
+const RefLink = (props) => {
+  const { refer } = props;
+  const link = refer.substring(refer.lastIndexOf("/") + 1);
+  return <Link href={`#${link.toLowerCase()}`}>{link}</Link>;
+};
+
+const Of = (props) => {
+  const { of, type } = props;
+  return (
+    <>
+      {of.map((o) => {
+        if (o["$ref"]) {
+          return (
+            <div className={`${type === "all" ? "" : "pl-8"}`}>
+              <p
+                className={`(${o.description} ? "mb-0" : "") ${type === "all" ? "" : pillStyle}`}
+              >
+                <RefLink refer={o["$ref"]} />
+              </p>
+              {o.description && (
+                <p>
+                  <Markdown>{o.description}</Markdown>
+                </p>
+              )}
+            </div>
+          );
+        } else if (o.type && o.type === "object") {
+          return (
+            <div className={`${type === "all" ? "" : "pl-8"}`}>
+              <p className={`(${o.description} ? "mb-0" : "") ${pillStyle}`}>
+                Object
+              </p>
+              {o.description && (
+                <p>
+                  <Markdown>{o.description}</Markdown>
+                </p>
+              )}
+              {o.properties && (
+                <PropertiesTable
+                  properties={Object.entries(o.properties)}
+                  schema={o}
+                />
+              )}
+            </div>
+          );
+        } else if (o.type && o.type === "string") {
+          return (
+            <div className={`${type === "all" ? "" : "pl-8"}`}>
+              <p className={`(${o.description} ? "mb-0" : "") ${pillStyle}`}>
+                String{" "}
+                {o.enum && o.enum.length > 0 && (
+                  <span>
+                    enum: [ {o.enum.map((e) => `"${e}"`).join(" | ")} ]
+                  </span>
+                )}
+              </p>
+              {o.description && (
+                <p>
+                  <Markdown>{o.description}</Markdown>
+                </p>
+              )}
+            </div>
+          );
+        } else if (o.type && o.type === "integer") {
+          return (
+            <div className={`${type === "all" ? "" : "pl-8"}`}>
+              <p className={`(${o.description} ? "mb-0" : "") ${pillStyle}`}>
+                {o.type[0].toUpperCase()}
+                {o.type.substring(1)}&lt;{o.format}&gt; Minimum: {o.minimum}
+              </p>
+              {o.description && <Markdown>{o.description}</Markdown>}
+            </div>
+          );
+        } else if (o.type && o.type === "boolean") {
+          return (
+            <div className={`${type === "all" ? "" : "pl-8"}`}>
+              <p className={`(${o.description} ? "mb-0" : "") ${pillStyle}`}>
+                Boolean
+              </p>
+              {o.description && <Markdown>{o.description}</Markdown>}
+            </div>
+          );
+        } else if (o.type && o.type === "array") {
+          return (
+            <div className={`${type === "all" ? "" : "pl-8"}`}>
+              <p className={`(${o.description} ? "mb-0" : "") ${pillStyle}`}>
+                [
+                {o.items &&
+                  Object.keys(o.items).map((k) => {
+                    if (k === "$ref") {
+                      return <RefLink refer={o.items[k]} />;
+                    }
+                  })}
+                ]
+              </p>
+              {o.description && (
+                <p>
+                  <Markdown>{o.description}</Markdown>
+                </p>
+              )}
+            </div>
+          );
+        } else if (o.anyOf) {
+          return <AnyOfInline anyof={o.anyOf} pill />;
+        } else if (o.type) {
+          return <p>{o.type}</p>;
+        }
+      })}
+    </>
+  );
+};
+
+const AllOf = (props) => {
+  const { allof } = props;
+  return (
+    <div>
+      <Of of={allof} type="all" />
+    </div>
+  );
+};
+
+const AnyOf = (props) => {
+  const { anyof } = props;
+  return (
+    <div>
+      <p className="p-2 border border-solid border-sui-blue-dark rounded-lg max-w-max font-bold text-white bg-sui-blue-dark">
+        Any of
+      </p>
+      <div className="ml-1 border-0 border-l-4 border-solid border-sui-blue-dark">
+        <Of of={anyof} type="any" />
+      </div>
+    </div>
+  );
+};
+
+const AnyOfInline = (props) => {
+  const { anyof, pill } = props;
+  return (
+    <div className={pill && `ml-8 mb-5 ${pillStyle}`}>
+      {anyof.map((a, i) => {
+        if (a["$ref"]) {
+          return (
+            <>
+              <RefLink refer={a["$ref"]} />
+              {i % 2 === 0 ? " | " : ""}
+            </>
+          );
+        }
+        if (a.type) {
+          return (
+            <>
+              {a.type}
+              {i % 2 === 0 ? " | " : ""}
+            </>
+          );
+        }
+      })}
+    </div>
+  );
+};
+
+const OneOf = (props) => {
+  const { oneof } = props;
+  return (
+    <div>
+      <p className="p-2 border border-solid border-sui-blue-dark rounded-lg max-w-max font-bold text-white bg-sui-blue-dark">
+        One of
+      </p>
+      <div className="ml-1 border-0 border-l-4 border-solid border-sui-blue-dark">
+        <Of of={oneof} type="one" />
+      </div>
+    </div>
+  );
+};
+
+const PropertiesTable = (props) => {
+  const { properties, schema } = props;
+  if (!properties) {
+    return;
+  }
+  return (
+    <table className="w-full table table-fixed">
+      <thead>
+        <tr>
+          <th className="">Property</th>
+          <th className="">Type</th>
+          <th className="w-20">Req?</th>
+          <th className="w-1/2">Description</th>
+        </tr>
+      </thead>
+      <tbody>
+        {properties.map(([k, v]) => (
+          <>
+            <tr key={k}>
+              <td>{k}</td>
+              <td>
+                {Array.isArray(v.type) ? v.type.join(" | ") : v.type}
+                {v.enum &&
+                  ` enum [ ${v.enum.map((e) => `"${e}"`).join(" | ")} ]`}
+                {v["$ref"] && <RefLink refer={v["$ref"]} />}
+                {v.anyOf && <AnyOfInline anyof={v.anyOf} />}
+                {v.allOf && <AllOf allof={v.allOf} />}
+                {v.oneOf && "ONEOFCELL"}
+                {v === true && "true"}
+              </td>
+              <td className="text-center">
+                {schema.required && schema.required.includes(k) ? "Yes" : "No"}
+              </td>
+              <td>{v.description && v.description}</td>
+            </tr>
+            {v.type === "object" ? (
+              <tr>
+                <td className={`${v.additionalProperties ? "text-right" : ""}`}>
+                  {v.additionalProperties && "Additional properties"}
+                </td>
+                <td colSpan={3}>
+                  {v.additionalProperties && v.additionalProperties["$ref"] && (
+                    <RefLink refer={v.additionalProperties["$ref"]} />
+                  )}
+                  {!v.additionalProperties && v.properties && (
+                    <PropertiesTable
+                      properties={Object.entries(v.properties)}
+                      schema={v}
+                    ></PropertiesTable>
+                  )}
+                  {v.additionalProperties &&
+                    v.additionalProperties.type &&
+                    v.additionalProperties.type}
+                  {v.additionalProperties && v.additionalProperties.anyOf && (
+                    <AnyOfInline anyof={v.additionalProperties.anyOf} />
+                  )}
+                  {v.additionalProperties &&
+                    v.additionalProperties === true &&
+                    "true"}
+                </td>
+              </tr>
+            ) : (
+              ""
+            )}
+          </>
+        ))}
+      </tbody>
+    </table>
+  );
+};
+
+const Components = (props) => {
+  const { schemas } = props;
+  const names = Object.keys(schemas);
+  const parentScrollContainerRef = () => {
+    (useRef < React.HTMLDivElement) | (null > null);
+  };
+  return (
+    <div ref={parentScrollContainerRef()}>
+      <h1>Component schemas</h1>
+      <ScrollSpy parentScrollContainerRef={parentScrollContainerRef()}>
+        {names &&
+          names.map((name) => {
+            return (
+              <div
+                key={name}
+                className="p-4 m-4 mt-8 snap-start scroll-mt-40 border border-sui-gray-50 border-solid rounded-lg"
+                id={name.toLowerCase()}
+              >
+                <h2>{name}</h2>
+
+                {schemas[name].description && (
+                  <p>
+                    <Markdown>{schemas[name].description}</Markdown>
+                  </p>
+                )}
+                {schemas[name].type && (
+                  <p className="p-2 border border-solid border-sui-blue-dark rounded-lg max-w-max font-bold text-white bg-sui-blue-dark">
+                    {schemas[name].type[0].toUpperCase()}
+                    {schemas[name].type.substring(1)}
+                    {schemas[name].enum &&
+                      ` enum [ ${schemas[name].enum.map((e) => `"${e}"`).join(" | ")} ]`}
+                  </p>
+                )}
+
+                {schemas[name].properties && (
+                  <PropertiesTable
+                    properties={Object.entries(schemas[name].properties)}
+                    schema={schemas[name]}
+                  />
+                )}
+                {schemas[name].allOf && <AllOf allof={schemas[name].allOf} />}
+                {schemas[name].oneOf && <OneOf oneof={schemas[name].oneOf} />}
+                {schemas[name].anyOf && <AnyOf anyof={schemas[name].anyOf} />}
+                {schemas[name]["$ref"] && (
+                  <RefLink refer={schemas[name]["$ref"]} />
+                )}
+                <details className="py-4">
+                  <summary>
+                    <span className="cursor-pointer">Toggle raw JSON</span>
+                  </summary>
+                  <pre>
+                    <code>{`"${name}":  ${JSON.stringify(schemas[name], null, 2)}`}</code>
+                  </pre>
+                </details>
+              </div>
+            );
+          })}
+      </ScrollSpy>
+    </div>
+  );
+};
+
+export default Components;
diff --git a/docs/site/src/components/API/api-ref/refnav.js b/docs/site/src/components/API/api-ref/refnav.js
index d7398e6b35903..003903cf8023f 100644
--- a/docs/site/src/components/API/api-ref/refnav.js
+++ b/docs/site/src/components/API/api-ref/refnav.js
@@ -9,7 +9,7 @@ const RefNav = (props) => {
   const { json, apis } = props;
 
   return (
-    <div className="mb-24">
+    <div className="mb-8">
       <div className="sticky -top-12 -mt-8 pt-8 pb-2 bg-white dark:bg-ifm-background-color-dark">
         <NetworkSelect />
       </div>
@@ -40,6 +40,7 @@ const RefNav = (props) => {
                   </Link>
                 );
               })}
+              
           </div>
         );
       })}
diff --git a/docs/site/src/components/API/api-ref/result.js b/docs/site/src/components/API/api-ref/result.js
index 542536775dd5c..45eb1f021d34b 100644
--- a/docs/site/src/components/API/api-ref/result.js
+++ b/docs/site/src/components/API/api-ref/result.js
@@ -41,7 +41,6 @@ const Property = (props) => {
 
 const Result = (props) => {
   const { json, result } = props;
-  //console.log(result)
   const hasRef = typeof result.schema["$ref"] !== "undefined";
 
   let refObj = {};
diff --git a/docs/site/src/components/API/index.js b/docs/site/src/components/API/index.js
index ccc5fbd053362..f2fe2f1aa21b7 100644
--- a/docs/site/src/components/API/index.js
+++ b/docs/site/src/components/API/index.js
@@ -4,7 +4,9 @@
 import React, { useState, useEffect } from "react";
 import ExecutionEnvironment from "@docusaurus/ExecutionEnvironment";
 import RefNav from "./api-ref/refnav";
+import CompNav from "./api-ref/compnav";
 import Methods from "./api-ref/method";
+import Components from "./api-ref/components";
 
 import ScrollSpy from "react-ui-scrollspy";
 
@@ -81,6 +83,7 @@ const Rpc = () => {
     <div className="mx-4 flex flex-row">
       <div className="pt-12 w-1/4 mb-24 flex-none max-h-screen overflow-y-auto sticky top-12">
         <RefNav json={openrpc} apis={apis} />
+        <CompNav json={openrpc} apis={apis} />
       </div>
 
       <main className="flex-grow w-3/4">
@@ -89,12 +92,15 @@ const Rpc = () => {
             <h1 className="fixed bg-white dark:bg-ifm-background-color-dark w-full py-4 top-14">
               Sui JSON-RPC Reference - Version: {openrpc.info.version}
             </h1>
-            <ScrollSpy>
+            
               <div className="">
                 <p className="pt-24">{openrpc.info.description}</p>
+                <ScrollSpy>
                 <Methods json={openrpc} apis={apis} schemas={schemas} />
+                <Components json={openrpc} apis={apis} schemas={schemas} />
+                </ScrollSpy>
               </div>
-            </ScrollSpy>
+            
           </div>
         </div>
       </main>