diff --git a/docs/reference/bigframes.geopandas/geoseries.rst b/docs/reference/bigframes.geopandas/geoseries.rst
index 91e853b1f8..481eb73b9d 100644
--- a/docs/reference/bigframes.geopandas/geoseries.rst
+++ b/docs/reference/bigframes.geopandas/geoseries.rst
@@ -8,8 +8,8 @@ GeoSeries
    :local:
    :backlinks: none
 
-Series
-------
+GeoSeries
+---------
 
 .. autoclass:: bigframes.geopandas.GeoSeries
     :members:
diff --git a/docs/reference/bigframes.pandas/frame.rst b/docs/reference/bigframes.pandas/frame.rst
index d1610accdd..bc9f714416 100644
--- a/docs/reference/bigframes.pandas/frame.rst
+++ b/docs/reference/bigframes.pandas/frame.rst
@@ -3,6 +3,14 @@
 DataFrame
 =========
 
+.. contents:: Table of Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+DataFrame
+---------
+
 .. autoclass:: bigframes.dataframe.DataFrame
     :members:
     :inherited-members:
@@ -18,3 +26,11 @@ Plotting handling
     :members:
     :inherited-members:
     :undoc-members:
+
+Struct handling
+^^^^^^^^^^^^^^^
+
+.. autoclass:: bigframes.operations.structs.StructFrameAccessor
+    :members:
+    :inherited-members:
+    :undoc-members:
diff --git a/docs/reference/bigframes.pandas/series.rst b/docs/reference/bigframes.pandas/series.rst
index 30cf851de7..547b262591 100644
--- a/docs/reference/bigframes.pandas/series.rst
+++ b/docs/reference/bigframes.pandas/series.rst
@@ -46,7 +46,7 @@ List handling
 Struct handling
 ^^^^^^^^^^^^^^^
 
-.. automodule:: bigframes.operations.structs
+.. autoclass:: bigframes.operations.structs.StructAccessor
     :members:
     :inherited-members:
     :undoc-members:
diff --git a/docs/templates/toc.yml b/docs/templates/toc.yml
index d57ab1c8ac..b4f513b11d 100644
--- a/docs/templates/toc.yml
+++ b/docs/templates/toc.yml
@@ -38,8 +38,13 @@
       uid: bigframes.exceptions
     name: Core Objects
   - items:
-    - name: DataFrame
-      uid: bigframes.dataframe.DataFrame
+    - items:
+      - name: DataFrame
+        uid: bigframes.dataframe.DataFrame
+      - name: PlotAccessor
+        uid: bigframes.operations.plotting.PlotAccessor
+      - name: StructAccessor
+        uid: bigframes.operations.structs.StructFrameAccessor
     - items:
       - name: DataFrameGroupBy
         uid: bigframes.core.groupby.DataFrameGroupBy
@@ -68,12 +73,6 @@
       name: Indexers
     - name: pandas
       uid: bigframes.pandas
-    - items:
-      - name: Plotting
-        uid: bigframes.operations.plotting
-      - name: PlotAccessor
-        uid: bigframes.operations.plotting.PlotAccessor
-      name: Plotting
     - items:
       - name: Series
         uid: bigframes.series.Series
@@ -83,6 +82,8 @@
         uid: bigframes.operations.strings.StringMethods
       - name: StructAccessor
         uid: bigframes.operations.structs.StructAccessor
+      - name: PlotAccessor
+        uid: bigframes.operations.plotting.PlotAccessor
       name: Series
     - name: Window
       uid: bigframes.core.window.Window