diff --git a/content/v2.0/reference/api/client-libraries/_index.md b/content/v2.0/reference/api/client-libraries/_index.md
index 1cd5867ea..7f55e132d 100644
--- a/content/v2.0/reference/api/client-libraries/_index.md
+++ b/content/v2.0/reference/api/client-libraries/_index.md
@@ -21,10 +21,12 @@ These client libraries are in active development and may not be feature-complete
 This list will continue to grow as more client libraries are released.
 {{% /note %}}
 
+- [Arduino](https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino)
+  _(contributed by [tobiasschuerg](https://github.com/tobiasschuerg))_
 - [C#](https://github.com/influxdata/influxdb-client-csharp)
 - [Go](https://github.com/influxdata/influxdb-client-go)
 - [Java](https://github.com/influxdata/influxdb-client-java)
-- [JavaScript/Node.js](https://github.com/influxdata/influxdb-client-js)
+- [JavaScript](https://github.com/influxdata/influxdb-client-js)
 - [PHP](https://github.com/influxdata/influxdb-client-php)
-- [Python](https://github.com/influxdata/influxdb-client-python)
+- [Python](/v2.0/reference/api/client-libraries/python/)
 - [Ruby](https://github.com/influxdata/influxdb-client-ruby)
diff --git a/content/v2.0/reference/api/client-libraries/arduino.md b/content/v2.0/reference/api/client-libraries/arduino.md
new file mode 100644
index 000000000..38acd6252
--- /dev/null
+++ b/content/v2.0/reference/api/client-libraries/arduino.md
@@ -0,0 +1,11 @@
+---
+title: InfluxDB Arduino client library
+list_title: Arduino
+description: Use the Arduino client library to interact with InfluxDB.
+menu:
+  v2_0_ref:
+    name: Arduino
+    parent: Client libraries
+    url: https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino
+weight: 201
+---
diff --git a/content/v2.0/reference/api/client-libraries/csharp-cl.md b/content/v2.0/reference/api/client-libraries/csharp.md
similarity index 89%
rename from content/v2.0/reference/api/client-libraries/csharp-cl.md
rename to content/v2.0/reference/api/client-libraries/csharp.md
index d98b749a8..b52a530d6 100644
--- a/content/v2.0/reference/api/client-libraries/csharp-cl.md
+++ b/content/v2.0/reference/api/client-libraries/csharp.md
@@ -1,9 +1,11 @@
 ---
 title: InfluxDB C# client library
+list_title: C#
 description: Use the C# client library to interact with InfluxDB.
 menu:
   v2_0_ref:
     name: C#
     parent: Client libraries
     url: https://github.com/influxdata/influxdb-client-csharp
+weight: 201
 ---
diff --git a/content/v2.0/reference/api/client-libraries/go-cl.md b/content/v2.0/reference/api/client-libraries/go.md
similarity index 89%
rename from content/v2.0/reference/api/client-libraries/go-cl.md
rename to content/v2.0/reference/api/client-libraries/go.md
index f8b8c88c0..47c3775bb 100644
--- a/content/v2.0/reference/api/client-libraries/go-cl.md
+++ b/content/v2.0/reference/api/client-libraries/go.md
@@ -1,9 +1,11 @@
 ---
 title: InfluxDB Go client library
+list_title: Go
 description: Use the Go client library to interact with InfluxDB.
 menu:
   v2_0_ref:
     name: Go
     parent: Client libraries
     url: https://github.com/influxdata/influxdb-client-go
+weight: 201
 ---
diff --git a/content/v2.0/reference/api/client-libraries/java-cl.md b/content/v2.0/reference/api/client-libraries/java.md
similarity index 88%
rename from content/v2.0/reference/api/client-libraries/java-cl.md
rename to content/v2.0/reference/api/client-libraries/java.md
index 95cebb4ee..9e079c903 100644
--- a/content/v2.0/reference/api/client-libraries/java-cl.md
+++ b/content/v2.0/reference/api/client-libraries/java.md
@@ -1,9 +1,11 @@
 ---
 title: InfluxDB Java client library
+list_title: Java
 description: Use the Java client library to interact with InfluxDB.
 menu:
   v2_0_ref:
     name: Java
     parent: Client libraries
     url: https://github.com/influxdata/influxdb-client-java
+weight: 201
 ---
diff --git a/content/v2.0/reference/api/client-libraries/js-cl.md b/content/v2.0/reference/api/client-libraries/js-cl.md
deleted file mode 100644
index 606a7aea9..000000000
--- a/content/v2.0/reference/api/client-libraries/js-cl.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: InfluxDB Javascript client library
-description: Use the Javascript client library to interact with InfluxDB.
-menu:
-  v2_0_ref:
-    name: Javascript
-    parent: Client libraries
-    url: https://github.com/influxdata/influxdb-client-js
----
diff --git a/content/v2.0/reference/api/client-libraries/js.md b/content/v2.0/reference/api/client-libraries/js.md
new file mode 100644
index 000000000..a1d3b694f
--- /dev/null
+++ b/content/v2.0/reference/api/client-libraries/js.md
@@ -0,0 +1,11 @@
+---
+title: InfluxDB JavaScript client library
+list_title: JavaScript
+description: Use the JavaScript client library to interact with InfluxDB.
+menu:
+  v2_0_ref:
+    name: JavaScript
+    parent: Client libraries
+    url: https://github.com/influxdata/influxdb-client-js
+weight: 201
+---
diff --git a/content/v2.0/reference/api/client-libraries/php-cl.md b/content/v2.0/reference/api/client-libraries/php.md
similarity index 89%
rename from content/v2.0/reference/api/client-libraries/php-cl.md
rename to content/v2.0/reference/api/client-libraries/php.md
index 6da557dee..c50637b1f 100644
--- a/content/v2.0/reference/api/client-libraries/php-cl.md
+++ b/content/v2.0/reference/api/client-libraries/php.md
@@ -1,9 +1,11 @@
 ---
 title: InfluxDB PHP client library
+list_title: PHP
 description: Use the PHP client library to interact with InfluxDB.
 menu:
   v2_0_ref:
     name: PHP
     parent: Client libraries
     url: https://github.com/influxdata/influxdb-client-php
+weight: 201
 ---
diff --git a/content/v2.0/reference/api/client-libraries/python-cl-guide.md b/content/v2.0/reference/api/client-libraries/python.md
similarity index 97%
rename from content/v2.0/reference/api/client-libraries/python-cl-guide.md
rename to content/v2.0/reference/api/client-libraries/python.md
index 1810763c1..9eb3f7008 100644
--- a/content/v2.0/reference/api/client-libraries/python-cl-guide.md
+++ b/content/v2.0/reference/api/client-libraries/python.md
@@ -1,13 +1,16 @@
 ---
 title: Python client library
+list_title: Python
 description: >
   Use the Python client library to interact with InfluxDB.
-weight: 103
+weight: 201
 menu:
   v2_0_ref:
     name: Python
     parent: Client libraries
 v2.0/tags: [client libraries, python]
+aliases:
+  - /v2.0/reference/api/client-libraries/python-cl-guide/
 ---
 
 Use the [InfluxDB Python client libary](https://github.com/influxdata/influxdb-client-python) to integrate InfluxDB into Python scripts and applications.
@@ -100,4 +103,3 @@ write_api = client.write_api(write_options=SYNCHRONOUS)
 p = influxdb_client.Point("my_measurement").tag("location", "Prague").field("temperature", 25.3)
 write_api.write(bucket=bucket, org=org, record=p)
 ```
-
diff --git a/content/v2.0/reference/api/client-libraries/ruby-cl.md b/content/v2.0/reference/api/client-libraries/ruby.md
similarity index 88%
rename from content/v2.0/reference/api/client-libraries/ruby-cl.md
rename to content/v2.0/reference/api/client-libraries/ruby.md
index b59999887..13abaa8c8 100644
--- a/content/v2.0/reference/api/client-libraries/ruby-cl.md
+++ b/content/v2.0/reference/api/client-libraries/ruby.md
@@ -1,9 +1,11 @@
 ---
 title: InfluxDB Ruby client library
+list_title: Ruby
 description: Use the Ruby client library to interact with InfluxDB.
 menu:
   v2_0_ref:
     name: Ruby
     parent: Client libraries
     url: https://github.com/influxdata/influxdb-client-ruby
+weight: 201
 ---