diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
index 5dc4be72f..d4606adc7 100644
--- a/docs/Doxyfile.in
+++ b/docs/Doxyfile.in
@@ -52,6 +52,9 @@ EXTRACT_ALL            = NO
 ALWAYS_DETAILED_SEC    = NO
 #REPEAT_BRIEF           = NO
 
+# Needed to automatically extract implicit brief descriptions in recent versions of Doxygen
+JAVADOC_AUTOBRIEF      = YES
+
 # Need these next options to ensure that functions with modifiers do not confuse the Doxygen parser.
 # And any further function modifiers here.
 MACRO_EXPANSION        = YES
diff --git a/docs/DoxygenLayout.xml b/docs/DoxygenLayout.xml
index 07c1c980c..ce397c909 100644
--- a/docs/DoxygenLayout.xml
+++ b/docs/DoxygenLayout.xml
@@ -3,7 +3,8 @@
   <!-- Navigation index tabs for HTML output -->
   <navindex>
     <tab type="mainpage" visible="yes" title="Introduction"></tab>
-    <tab type="modules" visible="yes" title="API Documentation" intro="These are the libraries supplied in the Raspberry Pi Pico SDK"/>
+    <tab type="topics" visible="yes" title="API Documentation" intro="These are the libraries supplied in the Raspberry Pi Pico SDK"/>
+    <tab type="modules" visible="no" title="" intro=""/>
     <tab type="user" url="@ref examples_page" visible="yes" title="Examples" intro="Links to SDK examples"/>
     <tab type="usergroup" url="@ref weblinks_page" visible="yes" title="Additional Documentation" intro="Links to datasheets and documentation">
       <tab type="user" url="https://rptl.io/pico-datasheet" visible="yes" title="Raspberry Pi Pico Datasheet" intro=""/>