diff --git a/Docs/python_api.md b/Docs/python_api.md
index fe053a615..02e56de0a 100644
--- a/Docs/python_api.md
+++ b/Docs/python_api.md
@@ -1,5 +1,5 @@
 #Python API reference
-This reference contains all the details about latest version of the Python API. To consult a valid reference for a specific CARLA release, please select it from the list hereunder.<br><br><i><strong>Warning!</strong> These links change the version of the documentation to a previous state. Make sure to go back to the latest to get the updated version of the docs.</i><br><details><summary><b>Previous references</b></summary><br><ul><li><a href=https://carla.readthedocs.io/en/0.9.8/python_api/><b>CARLA 0.9.8</b></a></li><li><a href=https://carla.readthedocs.io/en/0.9.7/python_api/><b>CARLA 0.9.7</b></a></li><li><a href=https://carla.readthedocs.io/en/0.9.6/python_api/><b>CARLA 0.9.6</b></a></li><li><a href=https://carla.readthedocs.io/en/0.9.5/python_api/><b>CARLA 0.9.5</b></a></li><li><a href=https://carla.readthedocs.io/en/0.9.4/python_api/><b>CARLA 0.9.4</b></a></li><li><a href=https://carla.readthedocs.io/en/0.9.3/python_api/><b>CARLA 0.9.3</b></a></li><li><a href=https://carla.readthedocs.io/en/0.9.2/python_api/><b>CARLA 0.9.2</b></a></li><li><a href=https://carla.readthedocs.io/en/0.9.1/python_api/><b>CARLA 0.9.1</b></a></li><li><a href=https://carla.readthedocs.io/en/0.9.0/python_api/><b>CARLA 0.9.0</b></a></li></ul></details><br><hr>  
+This reference contains all the details the Python API. To consult a previous reference for a specific CARLA release, change the documentation version using the panel in the bottom right corner.<br>This will change the whole documentation to a previous state. Remember to go back to <i>latest</i> to get the details of the current state of CARLA.<hr>  
 
 ## carla.Actor<a name="carla.Actor"></a>
 CARLA defines actors as anything that plays a role in the simulation or can be moved around. That includes: pedestrians, vehicles, sensors and traffic signs (considering traffic lights as part of these). Actors are spawned in the simulation by [carla.World](#carla.World) and they need for a [carla.ActorBlueprint](#carla.ActorBlueprint) to be created. These blueprints belong into a library provided by CARLA, find more about them [here](bp_library.md).  
diff --git a/PythonAPI/docs/doc_gen.py b/PythonAPI/docs/doc_gen.py
index a14a45865..b0cd9de01 100755
--- a/PythonAPI/docs/doc_gen.py
+++ b/PythonAPI/docs/doc_gen.py
@@ -584,19 +584,8 @@ class Documentation:
         md = MarkdownFile()
         md.first_title()
         md.textn(
-        "This reference contains all the details about latest version of the Python API. To consult a valid reference for a specific CARLA release, please select it from the list hereunder.<br>"
-        +"<br><i><strong>Warning!</strong> These links change the version of the documentation to a previous state. Make sure to go back to the latest to get the updated version of the docs.</i><br>"
-        +"<details><summary><b>Previous references</b></summary><br><ul>"
-+"<li><a href="+"https://carla.readthedocs.io/en/0.9.8/python_api/"+"><b>CARLA 0.9.8</b></a></li>"
-+"<li><a href="+"https://carla.readthedocs.io/en/0.9.7/python_api/"+"><b>CARLA 0.9.7</b></a></li>"
-+"<li><a href="+"https://carla.readthedocs.io/en/0.9.6/python_api/"+"><b>CARLA 0.9.6</b></a></li>"
-+"<li><a href="+"https://carla.readthedocs.io/en/0.9.5/python_api/"+"><b>CARLA 0.9.5</b></a></li>"
-+"<li><a href="+"https://carla.readthedocs.io/en/0.9.4/python_api/"+"><b>CARLA 0.9.4</b></a></li>"
-+"<li><a href="+"https://carla.readthedocs.io/en/0.9.3/python_api/"+"><b>CARLA 0.9.3</b></a></li>"
-+"<li><a href="+"https://carla.readthedocs.io/en/0.9.2/python_api/"+"><b>CARLA 0.9.2</b></a></li>"
-+"<li><a href="+"https://carla.readthedocs.io/en/0.9.1/python_api/"+"><b>CARLA 0.9.1</b></a></li>"
-+"<li><a href="+"https://carla.readthedocs.io/en/0.9.0/python_api/"+"><b>CARLA 0.9.0</b></a></li>"
-+"</ul></details><br><hr>")
+        "This reference contains all the details the Python API. To consult a previous reference for a specific CARLA release, change the documentation version using the panel in the bottom right corner.<br>"
+        +"This will change the whole documentation to a previous state. Remember to go back to <i>latest</i> to get the details of the current state of CARLA.<hr>")
         for module_name in sorted(self.master_dict):
             module = self.master_dict[module_name]
             module_key = module_name