diff --git a/source/text/sbasic/python/main0000.xhp b/source/text/sbasic/python/main0000.xhp
index fe47d7502f..40aaa194ea 100644
--- a/source/text/sbasic/python/main0000.xhp
+++ b/source/text/sbasic/python/main0000.xhp
@@ -34,16 +34,22 @@
         </case>
     </switch>
     <embed href="text/shared/guide/scripting.xhp#scripting"/>
+  <section id="pyContent">
     <embed href="text/sbasic/python/python_ide.xhp#pythonideh1"/>
     <embed href="text/sbasic/python/python_locations.xhp#pythonlocations1"/>
     <embed href="text/sbasic/python/python_shell.xhp#pythonshell1"/>
     <embed href="text/sbasic/python/python_programming.xhp#pythonprogrammingheading"/>
     <embed href="text/sbasic/python/python_examples.xhp#pythonexamples2"/>
+    <embed href="text/sbasic/python/python_2_basic.xhp#py2ba_h1"/>
     <embed href="text/sbasic/shared/03/sf_intro.xhp#title"/>
+  </section>
 
+  <section id="pyModules">
     <h2 id="hd_id901655365903313">%PRODUCTNAME Python Modules</h2>
-    <paragraph role="paragraph" id="par_id801655368030968"><link href="text/sbasic/shared/03/lib_ScriptForge.xhp" name="CHANGE ME"><literal>scriptforge</literal> module</link></paragraph>
     <paragraph role="paragraph" id="par_id21655367848705"><link href="text/sbasic/python/python_screen.xhp" name="msgbox module"><literal>msgbox</literal> module</link></paragraph>
+    <paragraph role="paragraph" id="par_id801655368030968"><link href="text/sbasic/shared/03/lib_ScriptForge.xhp" name="scriptforge module"><literal>scriptforge</literal> module</link></paragraph>
+    <paragraph role="paragraph" id="par_id12655637848750"><link href="text/sbasic/python/python_programming.xhp#uno" name="uno module"><literal>uno</literal> module</link></paragraph>
+  </section>
 
     <embed href="text/swriter/main0000.xhp#helpabouthelp"/>
 </body>
diff --git a/source/text/sbasic/python/python_programming.xhp b/source/text/sbasic/python/python_programming.xhp
index 9f53dfa60e..f70148d687 100644
--- a/source/text/sbasic/python/python_programming.xhp
+++ b/source/text/sbasic/python/python_programming.xhp
@@ -84,6 +84,7 @@
     <section id="PythonFileSystemImport" >
         <paragraph role="paragraph" id="N0241">%PRODUCTNAME Basic libraries contain classes, routines and variables, Python modules contain classes, functions and variables. Common pieces of reusable Python or UNO features must be stored in <link href="text/sbasic/python/python_locations.xhp" name="My macros">My macros</link> within <literal>(User Profile)/Scripts/python/pythonpath</literal>. Python libraries help organize modules in order to prevent module name collisions. Import <literal>uno.py</literal> inside shared modules.</paragraph>
     </section>
+  <section id="uno">
     <paragraph role="paragraph" id="N0242">Genuine BASIC UNO facilities can be inferred using <literal>uno.py</literal> module. Use <link href="text/sbasic/python/python_shell.xhp" name="Python interactive shell">Python interactive shell</link> to get a complete module description using <literal>dir()</literal> and <literal>help()</literal> Python commands.</paragraph>
       <bookmark xml-lang="en-US" branch="index" id="bm_id391659034206678">
         <bookmark_value>uno.py</bookmark_value>
@@ -196,6 +197,7 @@
             </tablecell>
         </tablerow>
     </table>
+  </section>
     <paragraph role="paragraph" id="N0272"><emph>LibreLogo</emph> and <emph>TableSample</emph> installation shared scripts use <literal>uno.py</literal> module.</paragraph>
     <h2 id="N0273">More Python-Basic samples</h2>
     <table  id="N0274">
diff --git a/source/text/sbasic/shared/main0601.xhp b/source/text/sbasic/shared/main0601.xhp
index 5697735638..523061c6fa 100644
--- a/source/text/sbasic/shared/main0601.xhp
+++ b/source/text/sbasic/shared/main0601.xhp
@@ -52,15 +52,13 @@
 <embed href="text/sbasic/shared/special_vba_func.xhp#exclusivevba"/>
 
 <h3 id="hd_id191548155077269">Working with Macros in Python</h3>
-<embed href="text/sbasic/python/main0000.xhp#pythonscriptshelp"/>
-<embed href="text/sbasic/python/python_ide.xhp#pythonideh1"/>
-<embed href="text/sbasic/python/python_locations.xhp#pythonlocations1"/>
-<embed href="text/sbasic/python/python_shell.xhp#pythonshell1"/>
-<embed href="text/sbasic/python/python_programming.xhp#pythonprogrammingheading"/>
-<embed href="text/sbasic/python/python_examples.xhp#pythonexamples2"/>
-<embed href="text/sbasic/python/python_2_basic.xhp#py2ba_h1"/>
 
-<paragraph role="heading" id="hd_id51528998827009" level="3" xml-lang="en-US">%PRODUCTNAME internal Basic macro libraries</paragraph>
+<embed href="text/sbasic/python/main0000.xhp#pythonscriptshelp"/>
+<embed href="text/sbasic/python/main0000.xhp#pyContent"/>
+
+<embed href="text/sbasic/python/main0000.xhp#pyModules"/>
+  
+<h3 id="hd_id51528998827009" xml-lang="en-US">%PRODUCTNAME internal Basic macro libraries</h3>
 <paragraph role="paragraph" id="par_id441528998842556" xml-lang="en-US">%PRODUCTNAME installs a set of Basic macro libraries that can be accessed from your Basic macros.</paragraph>
 <embed href="text/sbasic/shared/03/lib_tools.xhp#tools_lib"/>
 <embed href="text/sbasic/shared/03/lib_depot.xhp#depot_lib"/>