diff --git a/src/PHPDraft/Model/Elements/DataStructureElement.php b/src/PHPDraft/Model/Elements/DataStructureElement.php
index 0ab175b7..090b25ee 100644
--- a/src/PHPDraft/Model/Elements/DataStructureElement.php
+++ b/src/PHPDraft/Model/Elements/DataStructureElement.php
@@ -158,6 +158,7 @@ function __toString()
                 if (is_string($object)
                     || get_class($object) === self::class
                     || get_class($object) === ArrayStructureElement::class
+                    || get_class($object) === RequestBodyElement::class
                     || get_class($object) === EnumStructureElement::class
                 )
                 {
@@ -171,7 +172,7 @@ function __toString()
         }
 
         $type = (!in_array($this->type, self::DEFAULTS)) ?
-            '<a class="code" href="#object-' . str_replace(' ', '-', strtolower($this->type)) . '">' . $this->type . '</a>' : '<code>' . $this->type . '</code>';
+            '<a class="code" href="#object-' . str_replace(' ', '__', strtolower($this->type)) . '">' . $this->type . '</a>' : '<code>' . $this->type . '</code>';
 
         if (is_null($this->value))
         {
@@ -179,7 +180,7 @@ function __toString()
         }
         else
         {
-            if (is_object($this->value) && self::class === get_class($this->value))
+            if (is_object($this->value) && (self::class === get_class($this->value) || RequestBodyElement::class === get_class($this->value)))
             {
                 $value = '<div class="sub-struct">' . $this->value . '</div>';
             }
diff --git a/src/PHPDraft/Model/HTTPRequest.php b/src/PHPDraft/Model/HTTPRequest.php
index a9197051..801d3075 100644
--- a/src/PHPDraft/Model/HTTPRequest.php
+++ b/src/PHPDraft/Model/HTTPRequest.php
@@ -71,6 +71,9 @@ public function parse($object)
                 if ($value->element === 'dataStructure')
                 {
                     $this->parse_structure($value->content);
+                    echo '<pre>';
+                    var_dump($this->struct);
+                    echo '</pre>';
                     continue;
                 }
                 elseif ($value->element === 'asset')
@@ -117,6 +120,7 @@ private function parse_structure($objects)
 
             $this->struct[] = $struct;
         }
+
     }
 
     /**
diff --git a/src/PHPDraft/Model/HierarchyElement.php b/src/PHPDraft/Model/HierarchyElement.php
index db9f07a4..79e5dbff 100644
--- a/src/PHPDraft/Model/HierarchyElement.php
+++ b/src/PHPDraft/Model/HierarchyElement.php
@@ -84,6 +84,6 @@ public function get_href()
         $seperator = '-';
         $prep = ($this->parent !== NULL) ? $this->parent->get_href() . $seperator : '';
 
-        return $prep . str_replace(' ', $seperator, strtolower($this->title));
+        return $prep . str_replace(' ', '__', strtolower($this->title));
     }
 }
\ No newline at end of file
diff --git a/src/PHPDraft/Out/HTML/default.php b/src/PHPDraft/Out/HTML/default.php
index dd61b831..bcb29031 100644
--- a/src/PHPDraft/Out/HTML/default.php
+++ b/src/PHPDraft/Out/HTML/default.php
@@ -90,7 +90,7 @@ class="pull-right <?= $this->get_method_icon($transition->get_method()); ?>"></s
                             <ul class="list-unstyled">
                                 <?php foreach ($this->base_structures as $key => $structure): ?>
                                     <li>
-                                        <a href="#object-<?= str_replace(' ', '_', strtolower($key)); ?>"><?= $key; ?></a>
+                                        <a href="#object-<?= $this->strip_link_spaces($key); ?>"><?= $key; ?></a>
                                     </li>
                                 <?php endforeach; ?>
                             </ul>
@@ -180,9 +180,11 @@ class="value"><?= $value; ?></span>
                                             <?php endif; ?>
                                             <?php if (!empty($transition->request->struct)): ?>
                                                 <h5>Structure</h5>
-                                                <?php foreach ($transition->request->struct as $value): ?>
-                                                    <?= $value ?>
-                                                <?php endforeach; ?>
+                                                <div class="row">
+                                                    <?php foreach ($transition->request->struct as $value): ?>
+                                                        <?= $value ?>
+                                                    <?php endforeach; ?>
+                                                </div>
                                             <?php endif; ?>
                                         <?php endif; ?>
 
@@ -250,7 +252,8 @@ class="value"><?= $value; ?></span>
                                                             <?= $key; ?>
 
                                                         </h5>
-                                                        <pre class="collapse collapsed response-body" id="request-<?= $href ?>"><?= $value; ?></pre>
+                                                        <pre class="collapse collapsed response-body"
+                                                             id="request-<?= $href ?>"><?= $value; ?></pre>
                                                     </div>
                                                 <?php endforeach; ?>
                                             </div>
@@ -262,23 +265,23 @@ class="value"><?= $value; ?></span>
                     <?php endforeach; ?>
                 <?php endforeach; ?>
             <?php endforeach; ?>
-            <?php if(count($this->base_structures) > 0):?>
-            <h2><a id="datastructures">Data structures</a></h2>
-            <?php foreach ($this->base_structures as $key => $structure): ?>
-                <div class="panel panel-default object-<?= str_replace(' ', '_', strtolower($key)); ?> structure">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">
-                            <a id="object-<?= str_replace(' ', '_', strtolower($key)); ?>"><?= $key; ?></a>
-                        </h3>
-                    </div>
-                    <div class="panel-body">
-                        <div class="row">
-                            <?= $structure; ?>
+            <?php if (count($this->base_structures) > 0): ?>
+                <h2><a id="datastructures">Data structures</a></h2>
+                <?php foreach ($this->base_structures as $key => $structure): ?>
+                    <div class="panel panel-default object-<?= $this->strip_link_spaces($key); ?> structure">
+                        <div class="panel-heading">
+                            <h3 class="panel-title">
+                                <a id="object-<?= $this->strip_link_spaces($key); ?>"><?= $key; ?></a>
+                            </h3>
+                        </div>
+                        <div class="panel-body">
+                            <div class="row">
+                                <?= $structure; ?>
+                            </div>
                         </div>
                     </div>
-                </div>
-            <?php endforeach; ?>
-            <?php endif;?>
+                <?php endforeach; ?>
+            <?php endif; ?>
         </div>
     </div>
 </div>
@@ -288,6 +291,6 @@ class="value"><?= $value; ?></span>
 <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
         integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
         crossorigin="anonymous"></script>
-<script><?= Minifier::minify_js( file_get_contents(__DIR__ . '/' . $this->template . '.js')); ?></script>
+<script><?= Minifier::minify_js(file_get_contents(__DIR__ . '/' . $this->template . '.js')); ?></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/PHPDraft/Out/TemplateGenerator.php b/src/PHPDraft/Out/TemplateGenerator.php
index 0c2909c2..dd38af6e 100644
--- a/src/PHPDraft/Out/TemplateGenerator.php
+++ b/src/PHPDraft/Out/TemplateGenerator.php
@@ -170,4 +170,9 @@ function get_response_status($response)
         }
     }
 
+    function strip_link_spaces($key)
+    {
+        return str_replace(' ', '__', strtolower($key));
+    }
+
 }
\ No newline at end of file