diff --git a/docs/metadata.rst b/docs/metadata.rst
index 5826bd06b074eb91a34995459786ae5be9487c86..604ba56601f3b570d23f24d7375d10556e838045 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -7,26 +7,25 @@ Robot UUID
 **********
 
 .. list-table:: Robot UUID
-   :width: 30 70
-   :header rows: 1
+   :widths: 30 70
+   :header-rows: 1
 
    * - Vocabulary:
      - Custom
    * - URI
      - https://franka-wwl-demonstrator-iop-workstreams-ws-a3-55c043b308e72e51f.pages.git-ce.rwth-aachen.de/metadata.html#robot-uuid
    * - Comment
-    - A Universally Unique identfier obtained from https://www.uuidgenerator.net/api/version4 for a specific physical instance of a robot.
+     - A Universally Unique identifier obtained from https://www.uuidgenerator.net/api/version4 for a specific physical instance of a robot.
    * - Datatype
      - string
 
-
 ********
 Datatype
 ********
 
 .. list-table:: Datatype
-   :width: 30 70
-   :header rows: 1
+   :widths: 30 70
+   :header-rows: 1
 
    * - Vocabulary:
      - ISO 8373
@@ -37,56 +36,57 @@ Datatype
    * - Datatype
      - string
 
-*********************
-Velocityscalingfactor
-*********************
+***********************
+Velocity Scaling Factor
+***********************
 
-.. list-table:: Velocityscalingfactor
-   :width: 30 70
-   :header rows: 1
+.. list-table:: Velocity Scaling Factor
+   :widths: 30 70
+   :header-rows: 1
 
    * - Vocabulary:
      - http://docs.ros.org/en/jade/api/moveit_ros_planning_interface/html/classmoveit_1_1planning__interface_1_1MoveGroup.html
    * - URI
      - http://docs.ros.org/en/jade/api/moveit_ros_planning_interface/html/classmoveit_1_1planning__interface_1_1MoveGroup.html#a24f5ed1dad9e46d114c0c895b241ddc9
 
-*************************
-Accelerationscalingfactor
-*************************
+***************************
+Acceleration Scaling Factor
+***************************
+
+.. list-table:: Acceleration Scaling Factor
+   :widths: 30 70
+   :header-rows: 1
 
-.. list-table:: Accelerationscalingfactor
-   :width: 30 70
-   :header rows: 1
    * - Vocabulary:
      - http://docs.ros.org/en/jade/api/moveit_ros_planning_interface/html/classmoveit_1_1planning__interface_1_1MoveGroup.html
    * - URI
      - http://docs.ros.org/en/jade/api/moveit_ros_planning_interface/html/classmoveit_1_1planning__interface_1_1MoveGroup.html#ac82f6937c4a43690bc9fef08c42cee7e
 
-
 *****************
-Robot description
+Robot Description
 *****************
 
-.. list-table:: Robot description
-  :width: 30 70
-  :header rows: 1
-  * - Vocabulary:
-    - Custom 
-  * - URI
-    - https://franka-wwl-demonstrator-iop-workstreams-ws-a3-55c043b308e72e51f.pages.git-ce.rwth-aachen.de/metadata.html#robot-description
-  * - Comment
-    - The robot description: model and manufacturer.
-  * - Datatype
-    - string
+.. list-table:: Robot Description
+   :widths: 30 70
+   :header-rows: 1
 
+   * - Vocabulary:
+     - Custom 
+   * - URI
+     - https://franka-wwl-demonstrator-iop-workstreams-ws-a3-55c043b308e72e51f.pages.git-ce.rwth-aachen.de/metadata.html#robot-description
+   * - Comment
+     - The robot description: model and manufacturer.
+   * - Datatype
+     - string
 
 **********
 Git Commit
 **********
 
 .. list-table:: Git Commit
-   :width: 30 70
-   :header rows: 1
+   :widths: 30 70
+   :header-rows: 1
+
    * - Vocabulary:
      - https://git-scm.com/docs/git-commit
    * - URI