diff --git a/docs/sphinx/source/user_guide/index.rst b/docs/sphinx/source/user_guide/index.rst
index 8ce48515c9..2241f9dffa 100644
--- a/docs/sphinx/source/user_guide/index.rst
+++ b/docs/sphinx/source/user_guide/index.rst
@@ -1,20 +1,34 @@
+.. _user_guide:
+
 ==========
 User Guide
 ==========
 
+This user guide is an overview and explains some of the key features of pvlib.
 
 .. toctree::
+   :caption: Getting started
    :maxdepth: 2
-
+   
    package_overview
    installation
    introtutorial
+   
+.. toctree::
+   :caption: Modeling topics
+   :maxdepth: 2
+   
    pvsystem
    modelchain
    timetimezones
-   clearsky
    bifacial
+   clearsky
    weather_data
    singlediode
+
+.. toctree::
+   :caption: Extras
+   :maxdepth: 2
+
    nomenclature
    faq
diff --git a/docs/sphinx/source/whatsnew/v0.11.3.rst b/docs/sphinx/source/whatsnew/v0.11.3.rst
index 238ec1e9a6..4b0582c712 100644
--- a/docs/sphinx/source/whatsnew/v0.11.3.rst
+++ b/docs/sphinx/source/whatsnew/v0.11.3.rst
@@ -14,6 +14,7 @@ Enhancements
 
 Documentation
 ~~~~~~~~~~~~~
+* Restructure the user guide with subsections (:issue:`2302`, :pull:`2310`)
 
 
 Testing
@@ -26,5 +27,6 @@ Requirements
 
 Contributors
 ~~~~~~~~~~~~
+* Rajiv Daxini (:ghuser:`RDaxini`)