diff --git a/index.php b/index.php
index 5770ceb2..7e5c1f01 100755
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /**
  * Set up include path for source handling
  */
-set_include_path(get_include_path().":".__DIR__.'/src/');
+set_include_path(get_include_path() . ":" . __DIR__ . '/src/');
 
 /**
  * Set up required classes (with the autoloader)
@@ -14,13 +14,23 @@
 use PHPDraft\Parse\JsonToHTML;
 
 define('VERSION', '0');
-
 $values = UI::main($argv);
 
 $apib = new ApibFileParser($values['file']);
 $json = new Drafter($apib);
 $html = new JsonToHTML($json->parseToJson());
-$html->get_html($values['template'], $values['image']);
+$html->sorting = $values['sorting'];
+$html->get_html($values['template'], $values['image'], $values['css'], $values['js']);
+
 
+function phpdraft_var_dump($var)
+{
+    if (defined('__PHPDRAFT_PHAR__')) {
+        return;
+    }
+    echo '<pre>';
+    var_dump($var);
+    echo '</pre>';
+}
 
 ?>
diff --git a/src/PHPDraft/In/ApibFileParser.php b/src/PHPDraft/In/ApibFileParser.php
index 11ab555f..bd2bf343 100644
--- a/src/PHPDraft/In/ApibFileParser.php
+++ b/src/PHPDraft/In/ApibFileParser.php
@@ -12,12 +12,14 @@ class ApibFileParser
 {
     /**
      * Complete API Blueprint
+     *
      * @var string
      */
     protected $full_apib;
 
     /**
      * Location of the API Blueprint to parse
+     *
      * @var string
      */
     protected $location;
@@ -29,7 +31,7 @@ class ApibFileParser
      */
     public function __construct($filename = 'index.apib')
     {
-        $this->location  = pathinfo($filename, PATHINFO_DIRNAME) . '/';
+        $this->location = pathinfo($filename, PATHINFO_DIRNAME) . '/';
 
         $this->full_apib = $this->get_apib($filename);
     }
@@ -49,7 +51,8 @@ function get_apib($filename)
         $matches = [];
         preg_match_all('<!-- include\(([a-z_.\/]*?).apib\) -->', $file, $matches);
         foreach ($matches[1] as $value) {
-            $file = str_replace('<!-- include(' . $value . '.apib) -->', $this->get_apib($this->location . $value . '.apib'), $file);
+            $file = str_replace('<!-- include(' . $value . '.apib) -->',
+                $this->get_apib($this->location . $value . '.apib'), $file);
         }
 
         return $file;
@@ -57,8 +60,7 @@ function get_apib($filename)
 
     private function file_check($filename)
     {
-        if(!file_exists($filename))
-        {
+        if (!file_exists($filename)) {
             file_put_contents('php://stderr', "API File not found: $filename\n");
             exit(1);
         }
diff --git a/src/PHPDraft/Model/Category.php b/src/PHPDraft/Model/Category.php
index 2e7f54c6..3a22b8ec 100644
--- a/src/PHPDraft/Model/Category.php
+++ b/src/PHPDraft/Model/Category.php
@@ -14,6 +14,7 @@ class Category extends HierarchyElement
 {
     /**
      * API Structure element
+     *
      * @var DataStructureElement[]
      */
     public $structures = [];
@@ -28,10 +29,8 @@ class Category extends HierarchyElement
     function parse($object)
     {
         parent::parse($object);
-        foreach ($object->content as $key => $item)
-        {
-            switch ($item->element)
-            {
+        foreach ($object->content as $key => $item) {
+            switch ($item->element) {
                 case 'resource':
                     $resource         = new Resource($this);
                     $this->children[] = $resource->parse($item);
@@ -42,12 +41,9 @@ function parse($object)
                     $struct->deps = $deps;
                     $struct->parse($item, $deps);
 
-                    if (isset($item->content[0]->meta->id))
-                    {
+                    if (isset($item->content[0]->meta->id)) {
                         $this->structures[$item->content[0]->meta->id] = $struct;
-                    }
-                    else
-                    {
+                    } else {
                         $this->structures[] = $struct;
                     }
 
diff --git a/src/PHPDraft/Model/Elements/ArrayStructureElement.php b/src/PHPDraft/Model/Elements/ArrayStructureElement.php
index 73f980f1..46453edf 100644
--- a/src/PHPDraft/Model/Elements/ArrayStructureElement.php
+++ b/src/PHPDraft/Model/Elements/ArrayStructureElement.php
@@ -13,18 +13,22 @@
 class ArrayStructureElement extends DataStructureElement implements StructureElement
 {
 
+    /**
+     * Type of objects in the array
+     *
+     * @var
+     */
+    public $type_of;
+
     public function parse($item, &$dependencies)
     {
         $this->element = (isset($item->element)) ? $item->element : 'array';
-        $this->value = (isset($item->content)) ? $item->content : NULL;
+        $this->value   = (isset($item->content)) ? $item->content : null;
 
-        if (isset($item->content))
-        {
-            foreach ($item->content as $key => $sub_item)
-            {
+        if (isset($item->content)) {
+            foreach ($item->content as $key => $sub_item) {
                 $this->type[$key] = $sub_item->element;
-                switch ($sub_item->element)
-                {
+                switch ($sub_item->element) {
                     case 'array':
                         $value             = new ArrayStructureElement();
                         $this->value[$key] = $value->parse($sub_item, $dependencies);
@@ -38,7 +42,7 @@ public function parse($item, &$dependencies)
                         $this->value[$key] = $value->parse($sub_item, $dependencies);
                         break;
                     default:
-                        $this->value[$key] = (isset($sub_item->content)) ? $sub_item->content : NULL;
+                        $this->value[$key] = (isset($sub_item->content)) ? $sub_item->content : null;
                         break;
                 }
             }
@@ -49,18 +53,17 @@ public function parse($item, &$dependencies)
 
     function __toString()
     {
-        if (!is_array($this->type))
-        {
+        if (!is_array($this->type)) {
             return '';
         }
         $return = '<ul class="list-group">';
-        foreach ($this->type as $key => $item)
-        {
+        foreach ($this->type as $key => $item) {
             $type =
-                (in_array($item, self::DEFAULTS)) ? $item : '<a href="#object-' . str_replace(' ', '-', strtolower($item)) . '">' . $item . '</a>';
+                (in_array($item, self::DEFAULTS)) ? $item : '<a href="#object-' . str_replace(' ', '-',
+                        strtolower($item)) . '">' . $item . '</a>';
 
             $value =
-                (isset($this->value[$key])) ? ': <span class="example-value pull-right">' . json_encode($this->value[$key]) . '</span>' : NULL;
+                (isset($this->value[$key])) ? ': <span class="example-value pull-right">' . json_encode($this->value[$key]) . '</span>' : null;
 
             $return .= '<li class="list-group-item">' . $type . $value . '</li>';
         }
diff --git a/src/PHPDraft/Model/Elements/DataStructureElement.php b/src/PHPDraft/Model/Elements/DataStructureElement.php
index 090b25ee..41b09441 100644
--- a/src/PHPDraft/Model/Elements/DataStructureElement.php
+++ b/src/PHPDraft/Model/Elements/DataStructureElement.php
@@ -8,7 +8,7 @@
 
 namespace PHPDraft\Model\Elements;
 
-use Michelf\Markdown;
+use Michelf\MarkdownExtra;
 use PHPDraft\Model\StructureElement;
 
 class DataStructureElement implements StructureElement
@@ -16,36 +16,43 @@ class DataStructureElement implements StructureElement
 
     /**
      * Object key
+     *
      * @var string
      */
     public $key;
     /**
      * Object JSON type
+     *
      * @var mixed
      */
     public $type;
     /**
      * Object description
+     *
      * @var string
      */
     public $description;
     /**
      * Type of element
+     *
      * @var string
      */
-    public $element = NULL;
+    public $element = null;
     /**
      * Object value
+     *
      * @var mixed|DataStructureElement[]
      */
-    public $value = NULL;
+    public $value = null;
     /**
      * Object status (required|optional)
+     *
      * @var string
      */
     public $status = '';
     /**
      * List of object dependencies
+     *
      * @var string[]
      */
     public $deps;
@@ -60,26 +67,21 @@ class DataStructureElement implements StructureElement
      */
     public function parse($object, &$dependencies)
     {
-        if (empty($object) || !isset($object->content))
-        {
+        if (empty($object) || !isset($object->content)) {
             return $this;
         }
         $this->element = $object->element;
 
-        if (isset($object->content) && is_array($object->content))
-        {
-            foreach ($object->content as $value)
-            {
-                if (in_array($this->element, ['object', 'dataStructure']))
-                {
+        if (isset($object->content) && is_array($object->content)) {
+            foreach ($object->content as $value) {
+                if (in_array($this->element, ['object', 'dataStructure', 'hrefVariables'])) {
                     $struct = new DataStructureElement();
-                }
-                else
-                {
+                } else {
                     $struct = new EnumStructureElement();
                 }
                 $this->value[] = $struct->parse($value, $dependencies);
             }
+            unset($value);
 
             return $this;
         }
@@ -87,53 +89,60 @@ public function parse($object, &$dependencies)
 
         $this->key         = $object->content->key->content;
         $this->type        = $object->content->value->element;
-        $this->description = isset($object->meta->description) ? $object->meta->description : NULL;
+        $this->description = isset($object->meta->description) ? htmlentities($object->meta->description) : null;
         $this->status      =
-            isset($object->attributes->typeAttributes) ? join(', ', $object->attributes->typeAttributes) : NULL;
+            isset($object->attributes->typeAttributes) ? join(', ', $object->attributes->typeAttributes) : null;
 
         $this->description_as_html();
 
-        if (!in_array($this->type, self::DEFAULTS))
-        {
+        if (!in_array($this->type, self::DEFAULTS)) {
             $dependencies[] = $this->type;
         }
 
-        if ($this->type === 'object' || $this->type === 'array' || $this->type === 'enum' || !in_array($this->type, self::DEFAULTS))
-        {
-            $value = isset($object->content->value->content) ? $object->content->value : NULL;
-            if ($this->type === 'array')
-            {
-                $this->value = new ArrayStructureElement();
-            }
-            elseif ($this->type === 'enum')
-            {
-                $this->value = new EnumStructureElement();
-            }
-            else
-            {
-                $this->value = new DataStructureElement();
+        if ($this->type === 'object' || $this->type === 'array' || $this->type === 'enum' || !in_array($this->type,
+                self::DEFAULTS)
+        ) {
+            $value = isset($object->content->value->content) ? $object->content->value : null;
+            switch ($this->type) {
+                case 'array':
+                    $this->value = new ArrayStructureElement();
+
+                    break;
+                case 'enum':
+                    $this->value = new EnumStructureElement();
+
+                    break;
+                case 'object':
+                default:
+                    $this->value = new DataStructureElement();
+                    break;
             }
             $this->value = $this->value->parse($value, $dependencies);
 
             return $this;
         }
 
-        if (isset($object->content->value->content))
-        {
+        if (isset($object->content->value->content)) {
             $this->value = $object->content->value->content;
-        }
-        elseif (isset($object->content->value->attributes->samples))
-        {
+        } elseif (isset($object->content->value->attributes->samples)) {
             $this->value = join(' | ', $object->content->value->attributes->samples);
-        }
-        else
-        {
-            $this->value = NULL;
+        } else {
+            $this->value = null;
         }
 
         return $this;
     }
 
+    /**
+     * Parse the description to HTML
+     *
+     * @return string
+     */
+    public function description_as_html()
+    {
+        $this->description = MarkdownExtra::defaultTransform($this->description);
+    }
+
     /**
      * Print a string representation
      *
@@ -141,18 +150,14 @@ public function parse($object, &$dependencies)
      */
     function __toString()
     {
-        if ($this->value === NULL && $this->key === NULL)
-        {
+        if ($this->value === null && $this->key === null) {
             return '<span class="example-value pull-right">{ ... }</span>';
         }
 
-        if (is_array($this->value))
-        {
+        if (is_array($this->value)) {
             $return = '<table class="table table-striped">';
-            foreach ($this->value as $object)
-            {
-                if (get_class($object) === \stdClass::class)
-                {
+            foreach ($this->value as $object) {
+                if (get_class($object) === \stdClass::class) {
                     return json_encode($object);
                 }
                 if (is_string($object)
@@ -160,8 +165,7 @@ function __toString()
                     || get_class($object) === ArrayStructureElement::class
                     || get_class($object) === RequestBodyElement::class
                     || get_class($object) === EnumStructureElement::class
-                )
-                {
+                ) {
                     $return .= $object;
                 }
             }
@@ -172,35 +176,23 @@ 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))
-        {
+        if (is_null($this->value)) {
             $value = '';
-        }
-        else
-        {
-            if (is_object($this->value) && (self::class === get_class($this->value) || RequestBodyElement::class === get_class($this->value)))
-            {
+        } else {
+            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>';
-            }
-            elseif (is_object($this->value) && (ArrayStructureElement::class === get_class($this->value)))
-            {
+            } elseif (is_object($this->value) && (ArrayStructureElement::class === get_class($this->value))) {
                 $value = '<div class="array-struct">' . $this->value . '</div>';
-            }
-            elseif (is_array($this->value) && (EnumStructureElement::class === get_class($this->value[0])))
-            {
+            } elseif (is_array($this->value) && (EnumStructureElement::class === get_class($this->value))) {
                 $value = '<div class="enum-struct">' . $this->value . '</div>';
-            }
-            else
-            {
+            } else {
                 $value = '<span class="example-value pull-right">';
-                if (is_bool($this->value))
-                {
-                    $value .= ($this->value) ? 'TRUE' : 'FALSE';
-                }
-                else
-                {
+                if (is_bool($this->value)) {
+                    $value .= ($this->value) ? 'true' : 'false';
+                } else {
                     $value .= $this->value;
                 }
                 $value .= '</span>';
@@ -219,14 +211,18 @@ function __toString()
         return $return;
     }
 
-    /**
-     * Parse the description to HTML
-     *
-     * @return string
-     */
-    public function description_as_html()
+    function strval()
     {
-        $this->description = Markdown::defaultTransform($this->description);
+        if (is_array($this->value)) {
+            $key = rand(0, count($this->value));
+            if (is_subclass_of($this->value[$key], StructureElement::class)) {
+                return $this->value[$key]->strval();
+            }
+
+            return $this->value[$key];
+        }
+
+        return $this->value;
     }
 
 }
\ No newline at end of file
diff --git a/src/PHPDraft/Model/Elements/EnumStructureElement.php b/src/PHPDraft/Model/Elements/EnumStructureElement.php
index 70f77c91..0c4c5462 100644
--- a/src/PHPDraft/Model/Elements/EnumStructureElement.php
+++ b/src/PHPDraft/Model/Elements/EnumStructureElement.php
@@ -8,33 +8,33 @@
 
 namespace PHPDraft\Model\Elements;
 
-use Michelf\Markdown;
+use Michelf\MarkdownExtra;
 use PHPDraft\Model\StructureElement;
 
 class EnumStructureElement implements StructureElement
 {
     /**
      * Object description
+     *
      * @var string
      */
     public $description;
     /**
      * Type of element
+     *
      * @var string
      */
-    public $element = NULL;
+    public $element = null;
     /**
      * Object value
+     *
      * @var mixed
      */
-    public $value = NULL;
-    /**
-     * Object status (required|optional)
-     * @var string
-     */
-    public $status = '';
+    public $value = null;
     /**
+     * /**
      * List of object dependencies
+     *
      * @var string[]
      */
     public $deps;
@@ -42,26 +42,43 @@ class EnumStructureElement implements StructureElement
     /**
      * Parse a JSON object to a structure
      *
-     * @param \stdClass $item       An object to parse
+     * @param \stdClass $item         An object to parse
      * @param array     $dependencies Dependencies of this object
      *
      * @return EnumStructureElement self reference
      */
     function parse($item, &$dependencies)
     {
-        $this->element = (isset($item->element)) ? $item->element : NULL;
-        $this->description = (isset($item->meta->description)) ? $item->meta->description : NULL;
-        $this->value = (isset($item->content)) ? $item->content : NULL;
+        $this->element     = (isset($item->element)) ? $item->element : null;
+        $this->description = (isset($item->meta->description)) ? htmlentities($item->meta->description) : null;
+        if (isset($item->content) && is_array($item->content)) {
+            $deps = [];
+            foreach ($item->content as $value) {
+                $element       = new EnumStructureElement();
+                $this->value[] = $element->parse($value, $deps);
+            }
+            $this->element = $this->element . '(' . $deps[0] . ')';
+        } else {
+            $this->value = (isset($item->content)) ? $item->content : null;
+        }
         $this->description_as_html();
 
-        if (!in_array($this->element, self::DEFAULTS))
-        {
-            $dependencies[] = $this->element;
-        }
+        $dependencies[] = $this->element;
 
         return $this;
     }
 
+
+    /**
+     * Parse the description to HTML
+     *
+     * @return void
+     */
+    public function description_as_html()
+    {
+        $this->description = MarkdownExtra::defaultTransform($this->description);
+    }
+
     /**
      * Print a string representation
      *
@@ -69,23 +86,51 @@ function parse($item, &$dependencies)
      */
     function __toString()
     {
-        $type = (!in_array($this->element, self::DEFAULTS)) ?
-            '<a class="code" href="#object-' . str_replace(' ', '-', strtolower($this->element)) . '">' . $this->element . '</a>' : '<code>' . $this->element . '</code>';
+        if (is_array($this->value)) {
+            $return = '<ul class="list-group">';
+            foreach ($this->value as $item) {
+                $return .= '<li class="list-group-item">' . $item->simple_string() . '</li>';
+            }
+            $return .= '</ul>';
+
+            return $return;
+        }
+
+        $type   = (!in_array($this->element, self::DEFAULTS)) ?
+            '<a class="code" href="#object-' . str_replace(' ', '-',
+                strtolower($this->element)) . '">' . $this->element . '</a>' : '<code>' . $this->element . '</code>';
         $return = '<tr>' .
-                    '<td><span>' . $this->value . '</span></td>' .
-                    '<td>'.$type.'</td>' .
-                    '<td><span>' . $this->description . '</span></td>' .
-                  '</tr>';
+            '<td><span>' . $this->value . '</span></td>' .
+            '<td>' . $type . '</td>' .
+            '<td><span>' . $this->description . '</span></td>' .
+            '</tr>';
+
         return $return;
     }
 
-    /**
-     * Parse the description to HTML
-     *
-     * @return string
-     */
-    public function description_as_html()
+    function simple_string()
     {
-        $this->description = Markdown::defaultTransform($this->description);
+        $return = '<span>' . $this->value . "</span>";
+
+        if (!empty($this->description)) {
+            $return .= ' - ' . $this->description;
+        }
+
+
+        return $return;
+    }
+
+    function strval()
+    {
+        if (is_array($this->value)) {
+            $key = rand(0, count($this->value));
+            if (is_subclass_of($this->value[$key], StructureElement::class)) {
+                return $this->value[$key]->strval();
+            }
+
+            return $this->value[$key];
+        }
+
+        return $this->value;
     }
 }
\ No newline at end of file
diff --git a/src/PHPDraft/Model/Elements/RequestBodyElement.php b/src/PHPDraft/Model/Elements/RequestBodyElement.php
index 6ef01025..1962d747 100644
--- a/src/PHPDraft/Model/Elements/RequestBodyElement.php
+++ b/src/PHPDraft/Model/Elements/RequestBodyElement.php
@@ -22,15 +22,12 @@ class RequestBodyElement extends DataStructureElement implements StructureElemen
      */
     public function parse($object, &$dependencies)
     {
-        if (empty($object) || !isset($object->content))
-        {
+        if (empty($object) || !isset($object->content)) {
             return $this;
         }
         $this->element = $object->element;
-        if (isset($object->content) && is_array($object->content))
-        {
-            foreach ($object->content as $value)
-            {
+        if (isset($object->content) && is_array($object->content)) {
+            foreach ($object->content as $value) {
                 $struct        = new RequestBodyElement();
                 $this->value[] = $struct->parse($value, $dependencies);
             }
@@ -40,33 +37,30 @@ public function parse($object, &$dependencies)
 
         $this->key         = $object->content->key->content;
         $this->type        = $object->content->value->element;
-        $this->description = isset($object->meta->description) ? $object->meta->description : NULL;
+        $this->description = isset($object->meta->description) ? htmlentities($object->meta->description) : null;
         $this->description_as_html();
-        $this->status      =
-            isset($object->attributes->typeAttributes[0]) ? $object->attributes->typeAttributes[0] : NULL;
+        $this->status =
+            isset($object->attributes->typeAttributes[0]) ? $object->attributes->typeAttributes[0] : null;
 
-        if (!in_array($this->type, parent::DEFAULTS))
-        {
+        if (!in_array($this->type, parent::DEFAULTS)) {
             $dependencies[] = $this->type;
         }
 
-        if ($this->type === 'object')
-        {
-            $value       = isset($object->content->value->content) ? $object->content->value : NULL;
+        if ($this->type === 'object') {
+            $value       = isset($object->content->value->content) ? $object->content->value : null;
             $this->value = new RequestBodyElement();
             $this->value = $this->value->parse($value, $dependencies);
 
             return $this;
         }
 
-        if ($this->type === 'array')
-        {
+        if ($this->type === 'array') {
             $this->value = '[]';
 
             return $this;
         }
 
-        $this->value = isset($object->content->value->content) ? $object->content->value->content : NULL;
+        $this->value = isset($object->content->value->content) ? $object->content->value->content : null;
 
         return $this;
     }
@@ -80,14 +74,11 @@ public function parse($object, &$dependencies)
      */
     public function print_request($type = 'application/x-www-form-urlencoded')
     {
-        if (is_array($this->value))
-        {
+        if (is_array($this->value)) {
             $return = '<code class="request-body">';
-            $list = [];
-            foreach ($this->value as $object)
-            {
-                if (get_class($object) === self::class)
-                {
+            $list   = [];
+            foreach ($this->value as $object) {
+                if (get_class($object) === self::class) {
                     $list[] = $object->print_request($type);
                 }
             }
@@ -108,8 +99,7 @@ public function print_request($type = 'application/x-www-form-urlencoded')
 
         $value = (empty($this->value)) ? '?' : $this->value;
 
-        switch ($type)
-        {
+        switch ($type) {
             case 'application/x-www-form-urlencoded':
                 return $this->key . "=<span>" . $value . '</span>';
                 break;
diff --git a/src/PHPDraft/Model/HTTPRequest.php b/src/PHPDraft/Model/HTTPRequest.php
index 26cad040..cd336427 100644
--- a/src/PHPDraft/Model/HTTPRequest.php
+++ b/src/PHPDraft/Model/HTTPRequest.php
@@ -14,31 +14,36 @@ class HTTPRequest
 {
     /**
      * HTTP Headers
+     *
      * @var array
      */
     public $headers = [];
 
     /**
      * The HTTP Method
+     *
      * @var string
      */
     public $method;
 
     /**
      * Parent class
+     *
      * @var Transition
      */
     public $parent;
 
     /**
      * Body of the request (if POST or PUT)
+     *
      * @var mixed
      */
-    public $body = NULL;
+    public $body = null;
 
 
     /**
      * Structure of the request (if POST or PUT)
+     *
      * @var RequestBodyElement[]
      */
     public $struct = [];
@@ -64,20 +69,14 @@ public function parse($object)
     {
         $this->method = $object->attributes->method;
 
-        if (($this->method === 'POST' || $this->method === 'PUT') && !empty($object->content))
-        {
-            foreach ($object->content as $value)
-            {
-                if ($value->element === 'dataStructure')
-                {
-                    $this->parse_structure($value->content);
+        if (($this->method === 'POST' || $this->method === 'PUT') && !empty($object->content)) {
+            foreach ($object->content as $value) {
+                if ($value->element === 'dataStructure') {
+                    $this->parse_structure($value);
                     continue;
-                }
-                elseif ($value->element === 'asset')
-                {
-                    if (in_array('messageBody', $value->meta->classes))
-                    {
-                        $this->body[] = (isset($value->content)) ? $value->content : NULL;
+                } elseif ($value->element === 'asset') {
+                    if (in_array('messageBody', $value->meta->classes)) {
+                        $this->body[]                  = (isset($value->content)) ? $value->content : null;
                         $this->headers['Content-Type'] =
                             (isset($value->attributes->contentType)) ? $value->attributes->contentType : '';
                     }
@@ -85,16 +84,13 @@ public function parse($object)
             }
         }
 
-        if (isset($object->attributes->headers))
-        {
-            foreach ($object->attributes->headers->content as $value)
-            {
+        if (isset($object->attributes->headers)) {
+            foreach ($object->attributes->headers->content as $value) {
                 $this->headers[$value->content->key->content] = $value->content->value->content;
             }
         }
 
-        if ($this->body === NULL)
-        {
+        if ($this->body === null) {
             $this->body = &$this->struct;
         }
 
@@ -104,20 +100,16 @@ public function parse($object)
     /**
      * Parse the objects into a request body
      *
-     * @param \stdClass[] $objects JSON objects
+     * @param \stdClass $objects JSON objects
      */
     private function parse_structure($objects)
     {
-        foreach ($objects as $object)
-        {
-            $deps   = [];
-            $struct = new RequestBodyElement();
-            $struct->parse($object, $deps);
-            $struct->deps = $deps;
-
-            $this->struct[] = $struct;
-        }
+        $deps   = [];
+        $struct = new RequestBodyElement();
+        $struct->parse($objects, $deps);
+        $struct->deps = $deps;
 
+        $this->struct = $struct;
     }
 
     /**
@@ -133,27 +125,24 @@ public function get_curl_command($base_url, $additional = [])
     {
         $options = [];
 
-        $type = (isset($this->headers['Content-Type'])) ? $this->headers['Content-Type'] : NULL;
+        $type = (isset($this->headers['Content-Type'])) ? $this->headers['Content-Type'] : null;
 
         $options[] = '-X' . $this->method;
-        if (is_string($this->body))
-        {
+        if (is_string($this->body)) {
             $options[] = '--data-binary "' . $this->body . '"';
-        }
-        else
-        {
-            foreach ($this->struct as $body)
-            {
+        } elseif (is_array($this->body)) {
+            $options[] = '--data-binary "' . join('', $this->body) . '"';
+        } elseif (is_subclass_of($this->struct, StructureElement::class)) {
+            foreach ($this->struct->value as $body) {
                 $options[] = '--data-binary "' . strip_tags($body->print_request($type)) . '"';
             }
         }
-        foreach ($this->headers as $header => $value)
-        {
+        foreach ($this->headers as $header => $value) {
             $options[] = '-H "' . $header . ': ' . $value . '"';
         }
         $options = array_merge($options, $additional);
 
-        return htmlspecialchars('curl ' . join(' ', $options) . ' "' . $this->parent->build_url($base_url) . '"');
+        return htmlspecialchars('curl ' . join(' ', $options) . ' "' . $this->parent->build_url($base_url, true) . '"');
     }
 
 
diff --git a/src/PHPDraft/Model/HTTPResponse.php b/src/PHPDraft/Model/HTTPResponse.php
index f9c0e973..ca99486b 100644
--- a/src/PHPDraft/Model/HTTPResponse.php
+++ b/src/PHPDraft/Model/HTTPResponse.php
@@ -14,30 +14,35 @@ class HTTPResponse
 {
     /**
      * HTTP Status code
+     *
      * @var int
      */
     public $statuscode;
 
     /**
      * Response headers
+     *
      * @var array
      */
     public $headers = [];
 
     /**
      * Response bodies
+     *
      * @var array
      */
     public $content = [];
 
     /**
      * Response structure
+     *
      * @var DataStructureElement[]
      */
     public $structure = [];
 
     /**
      * Parent entity
+     *
      * @var Transition
      */
     protected $parent;
@@ -58,8 +63,7 @@ public function parse($object)
     {
         $this->statuscode = intval($object->attributes->statusCode);
 
-        if (isset($object->attributes))
-        {
+        if (isset($object->attributes)) {
             $this->parse_headers($object->attributes->headers);
         }
 
@@ -77,10 +81,8 @@ public function parse($object)
      */
     protected function parse_headers($object)
     {
-        foreach ($object->content as $value)
-        {
-            if (isset($value->content))
-            {
+        foreach ($object->content as $value) {
+            if (isset($value->content)) {
                 $this->headers[$value->content->key->content] = $value->content->value->content;
             }
         }
@@ -95,16 +97,13 @@ protected function parse_headers($object)
      */
     protected function parse_content($object)
     {
-        foreach ($object->content as $value)
-        {
-            if ($value->element === 'dataStructure')
-            {
+        foreach ($object->content as $value) {
+            if ($value->element === 'dataStructure') {
                 $this->parse_structure($value->content);
                 continue;
             }
 
-            if (isset($value->attributes))
-            {
+            if (isset($value->attributes)) {
                 $this->content[$value->attributes->contentType] = $value->content;
             }
         }
@@ -119,8 +118,7 @@ protected function parse_content($object)
      */
     protected function parse_structure($objects)
     {
-        foreach ($objects as $object)
-        {
+        foreach ($objects as $object) {
             $deps   = [];
             $struct = new DataStructureElement();
             $struct->parse($object, $deps);
diff --git a/src/PHPDraft/Model/HierarchyElement.php b/src/PHPDraft/Model/HierarchyElement.php
index 79e5dbff..7aae429e 100644
--- a/src/PHPDraft/Model/HierarchyElement.php
+++ b/src/PHPDraft/Model/HierarchyElement.php
@@ -8,7 +8,7 @@
 
 namespace PHPDraft\Model;
 
-use Michelf\Markdown;
+use Michelf\MarkdownExtra;
 
 abstract class HierarchyElement
 {
@@ -38,7 +38,7 @@ abstract class HierarchyElement
      *
      * @var HierarchyElement|NULL
      */
-    protected $parent = NULL;
+    protected $parent = null;
 
     /**
      * Parse a JSON object to an element
@@ -49,26 +49,22 @@ abstract class HierarchyElement
      */
     function parse($object)
     {
-        if (isset($object->meta) && isset($object->meta->title))
-        {
+        if (isset($object->meta) && isset($object->meta->title)) {
             $this->title = $object->meta->title;
         }
-        if (!isset($object->content))
-        {
+        if (!isset($object->content)) {
             return;
         }
-        foreach ($object->content as $key => $item)
-        {
-            if ($item->element === 'copy')
-            {
-                $this->description = preg_replace('/(<\/?p>)?/', '', Markdown::defaultTransform($item->content), 2);
+        foreach ($object->content as $key => $item) {
+            if ($item->element === 'copy') {
+                $this->description =
+                    preg_replace('/(<\/?p>)?/', '', MarkdownExtra::defaultTransform($item->content), 2);
                 unset($object->content[$key]);
                 continue;
             }
         }
 
-        if (!empty($object->content))
-        {
+        if (!empty($object->content)) {
             $object->content = array_slice($object->content, 0);
         }
 
@@ -82,8 +78,8 @@ function parse($object)
     public function get_href()
     {
         $seperator = '-';
-        $prep = ($this->parent !== NULL) ? $this->parent->get_href() . $seperator : '';
+        $prep      = ($this->parent !== null) ? $this->parent->get_href() . $seperator : '';
 
-        return $prep . str_replace(' ', '__', strtolower($this->title));
+        return $prep . str_replace(' ', '-', strtolower($this->title));
     }
 }
\ No newline at end of file
diff --git a/src/PHPDraft/Model/Resource.php b/src/PHPDraft/Model/Resource.php
index a096262f..65905313 100644
--- a/src/PHPDraft/Model/Resource.php
+++ b/src/PHPDraft/Model/Resource.php
@@ -3,7 +3,7 @@
  * This file contains the Resource.php
  *
  * @package PHPDraft\Model
- * @author Sean Molenaar<sean@seanmolenaar.eu>
+ * @author  Sean Molenaar<sean@seanmolenaar.eu>
  */
 
 namespace PHPDraft\Model;
@@ -38,12 +38,15 @@ function parse($object)
     {
         parent::parse($object);
 
-        if (isset($object->attributes)) $this->href = $object->attributes->href;
+        if (isset($object->attributes)) {
+            $this->href = $object->attributes->href;
+        }
 
-        foreach ($object->content as $key => $item)
-        {
-            if ($item->element === 'copy') continue;
-            $transition = new Transition($this);
+        foreach ($object->content as $key => $item) {
+            if ($item->element === 'copy') {
+                continue;
+            }
+            $transition       = new Transition($this);
             $this->children[] = $transition->parse($item);
         }
 
diff --git a/src/PHPDraft/Model/StructureElement.php b/src/PHPDraft/Model/StructureElement.php
index e50218e2..0a7b4c10 100644
--- a/src/PHPDraft/Model/StructureElement.php
+++ b/src/PHPDraft/Model/StructureElement.php
@@ -13,9 +13,10 @@ interface StructureElement
 {
     /**
      * Default datatypes
+     *
      * @var array
      */
-    const DEFAULTS = ['boolean', 'string', 'number', 'object', 'array'];
+    const DEFAULTS = ['boolean', 'string', 'number', 'object', 'array', 'enum'];
 
     /**
      * Parse a JSON object to a structure
diff --git a/src/PHPDraft/Model/Transition.php b/src/PHPDraft/Model/Transition.php
index 26fd01fb..ad891870 100644
--- a/src/PHPDraft/Model/Transition.php
+++ b/src/PHPDraft/Model/Transition.php
@@ -3,7 +3,7 @@
  * This file contains the Transition
  *
  * @package PHPDraft\Model
- * @author Sean Molenaar<sean@seanmolenaar.eu>
+ * @author  Sean Molenaar<sean@seanmolenaar.eu>
  */
 
 namespace PHPDraft\Model;
@@ -21,21 +21,24 @@ class Transition extends HierarchyElement
 
     /**
      * URI
+     *
      * @var string
      */
     public $href;
 
     /**
      * URL variables
-     * @var array
+     *
+     * @var DataStructureElement|NULL
      */
-    public $url_variables = [];
+    public $url_variables = null;
 
     /**
      * Data variables
+     *
      * @var array
      */
-    public $data_variables = [];
+    public $data_variables = null;
 
     /**
      * The request
@@ -53,6 +56,7 @@ class Transition extends HierarchyElement
 
     /**
      * Structures used (if any)
+     *
      * @var DataStructureElement[]
      */
     public $structures = [];
@@ -80,47 +84,25 @@ function parse($object)
 
         $this->href = (isset($object->attributes->href)) ? $object->attributes->href : $this->parent->href;
 
-        if (isset($object->attributes->hrefVariables))
-        {
-            foreach ($object->attributes->hrefVariables->content as $item)
-            {
-                if (is_array($item->content->value->content))
-                {
-                    foreach ($item->content->value->content as $key => $value)
-                    {
-                        $item->content->value->content[$key] = (is_object($value)) ? $value->content : $value;
-                    }
-                }
+        if (isset($object->attributes->hrefVariables)) {
 
-                $deps                                              = [];
-                $struct                                            = new DataStructureElement();
-                $this->url_variables[$item->content->key->content] = $struct->parse($item, $deps);
-            }
+            $deps                = [];
+            $struct              = new DataStructureElement();
+            $this->url_variables = $struct->parse($object->attributes->hrefVariables, $deps);
         }
 
-        if (isset($object->attributes->data))
-        {
-            foreach ($object->attributes->data->content as $base)
-            {
-                foreach ($base->content as $item)
-                {
-                    $deps                                               = [];
-                    $struct                                             = new DataStructureElement();
-                    $this->data_variables[$item->content->key->content] = $struct->parse($item, $deps);
-                }
-            }
+        if (isset($object->attributes->data)) {
+            $deps                 = [];
+            $struct               = new DataStructureElement();
+            $this->data_variables = $struct->parse($object->attributes->data, $deps);
         }
 
-        if (isset($object->content[0]->content))
-        {
-            foreach ($object->content[0]->content as $item)
-            {
-                if ($item->element === 'httpRequest')
-                {
+        if (isset($object->content[0]->content)) {
+            foreach ($object->content[0]->content as $item) {
+                if ($item->element === 'httpRequest') {
                     $this->request = new HTTPRequest($this);
                     $this->request->parse($item);
-                } elseif ($item->element === 'httpResponse')
-                {
+                } elseif ($item->element === 'httpResponse') {
                     $response          = new HTTPResponse($this);
                     $this->responses[] = $response->parse($item);
                 }
@@ -135,25 +117,87 @@ function parse($object)
      *
      * @param string $base_url the URL to which the URL variables apply
      *
+     * @param bool   $clean    Get the URL without HTML
+     *
      * @return string a HTML representation of the transition URL
      */
-    public function build_url($base_url = '')
+    public function build_url($base_url = '', $clean = false)
     {
-        $url = $this->href;
-        foreach ($this->url_variables as $key => $value)
-        {
-            $urlvalue = $value->value;
-            if (is_array($value->value) && !is_string($value->value))
-            {
-                $urlvalue = $value->value[0];
+        $url = $this->overlap_urls($this->parent->href, $this->href);
+        if ($url === false) {
+            $url = $this->parent->href . $this->href;
+        }
+        if ($this->url_variables !== null) {
+            foreach ($this->url_variables->value as $value) {
+                $urlvalue = $value->value;
+                if (is_subclass_of($value, StructureElement::class)) {
+                    $urlvalue = $value->strval();
+                }
+
+                $url =
+                    preg_replace('/({\?' . $value->key . '})/',
+                        '?<var class="url-param">' . $value->key . '</var>=<var class="url-value">' . urlencode($urlvalue) . '</var>',
+                        $url);
+                $url =
+                    preg_replace('/({\&' . $value->key . '})/',
+                        '&<var class="url-param">' . $value->key . '</var>=<var class="url-value">' . urlencode($urlvalue) . '</var>',
+                        $url);
+                $url =
+                    preg_replace('/({' . $value->key . '})/',
+                        '<var class="url-value">' . urlencode($urlvalue) . '</var>', $url);
             }
+        }
 
-            $url = preg_replace('/({\?' . $key . '})/', '?<var class="url-param">' . $key . '</var>=<var class="url-value">' . urlencode($urlvalue) . '</var>', $url);
-            $url = preg_replace('/({\&' . $key . '})/', '&<var class="url-param">' . $key . '</var>=<var class="url-value">' . urlencode($urlvalue) . '</var>', $url);
-            $url = preg_replace('/({' . $key . '})/', '<var class="url-value">' . urlencode($urlvalue) . '</var>', $url);
+        if ($clean) {
+            return strip_tags($base_url . $url);
         }
 
-        return $base_url.$url;
+        return $base_url . $url;
+    }
+
+    /**
+     * Overlap the URLS to get one consistent URL
+     *
+     * @param $str1
+     * @param $str2
+     *
+     * @return bool|string
+     *
+     * @see http://stackoverflow.com/questions/2945446/built-in-function-to-combine-overlapping-string-sequences-in-php
+     */
+    private function overlap_urls($str1, $str2)
+    {
+        if ($overlap = $this->find_overlap($str1, $str2)) {
+            $overlap = $overlap[count($overlap) - 1];
+            $str1    = substr($str1, 0, -strlen($overlap));
+            $str2    = substr($str2, strlen($overlap));
+
+            return $str1 . $overlap . $str2;
+        }
+
+        return false;
+    }
+
+    private function find_overlap($str1, $str2)
+    {
+        $return = [];
+        $sl1    = strlen($str1);
+        $sl2    = strlen($str2);
+        $max    = $sl1 > $sl2 ? $sl2 : $sl1;
+        $i      = 1;
+        while ($i <= $max) {
+            $s1 = substr($str1, -$i);
+            $s2 = substr($str2, 0, $i);
+            if ($s1 == $s2) {
+                $return[] = $s1;
+            }
+            $i++;
+        }
+        if (!empty($return)) {
+            return $return;
+        }
+
+        return false;
     }
 
     /**
@@ -169,7 +213,7 @@ public function get_method()
     /**
      * Generate a cURL request to run the transition
      *
-     * @param string $base_url base URL of the server
+     * @param string $base_url   base URL of the server
      *
      * @param array  $additional additional arguments to pass
      *
@@ -179,4 +223,5 @@ public function get_curl_command($base_url, $additional = [])
     {
         return $this->request->get_curl_command($base_url, $additional);
     }
+
 }
\ No newline at end of file
diff --git a/src/PHPDraft/Out/HTML/default.css b/src/PHPDraft/Out/HTML/default.css
index e8293db4..156c7c22 100644
--- a/src/PHPDraft/Out/HTML/default.css
+++ b/src/PHPDraft/Out/HTML/default.css
@@ -13,6 +13,15 @@ div.main-url {
     word-break: break-all;
 }
 
+.request-panel > code, .popover-content {
+    word-break: break-all;
+}
+
+body .media h1.media-heading {
+    margin-top: 20px;
+    margin-bottom: 10px;
+}
+
 .panel-title var, h4.response var {
     padding: 6px 12px;
     margin-right: 12px;
@@ -43,8 +52,7 @@ h4.response.error var {
 }
 
 body .col-md-10 h2:first-child,
-body .col-md-10 h3:first-child
-{
+body .col-md-10 h3:first-child {
     margin-top: 0;
 }
 
diff --git a/src/PHPDraft/Out/HTML/default.js b/src/PHPDraft/Out/HTML/default.js
index cd9fef54..78e97a4d 100644
--- a/src/PHPDraft/Out/HTML/default.js
+++ b/src/PHPDraft/Out/HTML/default.js
@@ -1,5 +1,12 @@
 $(function () {
     $('[data-toggle="popover"]').popover();
+    $('body').on('click', function (e) {
+        $('[data-toggle="popover"]').each(function () {
+            if (!$(this).is(e.target) && $(this).has(e.target).length === 0 && $('.popover').has(e.target).length === 0) {
+                $(this).popover('hide');
+            }
+        });
+    });
 });
 
 $('.collapse.request-panel').on('shown.bs.collapse', function () {
diff --git a/src/PHPDraft/Out/HTML/default.php b/src/PHPDraft/Out/HTML/default.php
index bcb29031..22c8a3a4 100644
--- a/src/PHPDraft/Out/HTML/default.php
+++ b/src/PHPDraft/Out/HTML/default.php
@@ -19,19 +19,29 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
           integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+    <?php foreach ($this->css as $style): ?>
+        <link rel="stylesheet" href="<?= $style ?>">
+    <?php endforeach; ?>
     <style>
         <?= Minifier::minify_css(file_get_contents(__DIR__ . '/'.$this->template.'.css'));?>
     </style>
 </head>
 <body>
 <div class="container-fluid">
-    <div class="row">
-        <div class="col-md-12">
-            <h1><?= $this->base_data['TITLE']; ?>
+    <div class="media">
+        <div class="media-body">
+            <h1 class="media-heading"><?= $this->base_data['TITLE']; ?>
                 <small><?= $this->base_data['HOST']; ?></small>
             </h1>
             <p class="lead"><?= $this->base_data['DESC']; ?></p>
         </div>
+        <?php if (!empty($this->image)): ?>
+            <div class="media-right">
+                <a href="#">
+                    <img class="media-object" src="<?= $this->image ?>" alt="Image">
+                </a>
+            </div>
+        <?php endif; ?>
     </div>
     <div class="row">
         <div class="col-md-2 method-nav">
@@ -53,7 +63,8 @@
                                 <ul class="list-unstyled">
                                     <?php foreach ($category->children as $resource): ?>
                                         <li>
-                                            <a href="#<?= str_replace('-', '/', $resource->get_href()); ?>"><?= $resource->title; ?></a>
+                                            <a href="#<?= str_replace('-', '/',
+                                                $resource->get_href()); ?>"><?= $resource->title; ?></a>
                                         </li>
                                         <ul>
                                             <?php foreach ($resource->children as $transition): ?>
@@ -122,7 +133,8 @@ class="panel panel-default <?= $transition->get_method(); ?>">
                                     <var><?= $transition->get_method(); ?></var>
                                     <code><?= $transition->href; ?></code>
                                     <a class="pull-right transition-title"
-                                       id="<?= str_replace('-', '/', $transition->get_href()); ?>"><?= $transition->title; ?></a>
+                                       id="<?= str_replace('-', '/',
+                                           $transition->get_href()); ?>"><?= $transition->title; ?></a>
                                 </h3>
                             </div>
                             <div class="panel-body">
@@ -133,15 +145,12 @@ class="btn btn-default curl"
                                    tabindex="0"
                                    data-placement="left"
                                    data-toggle="popover"
-                                   data-content="<?= $transition->get_curl_command($this->base_data['HOST'], []); ?>">
+                                   data-html="true"
+                                   data-content="<textarea rows='8' cols='75'><?= $transition->get_curl_command($this->base_data['HOST'],
+                                       []); ?></textarea>">
                                     <span class="glyphicon glyphicon-copy"></span>
                                 </a>
                                 <p class="lead"><?= $transition->description; ?></p>
-                                <?php if ($transition->url_variables !== []): ?>
-                                    <h4>Example URI</h4>
-                                    <span class="base-url"><?= $this->base_data['HOST']; ?></span>
-                                    <em><?= $transition->build_url(); ?></em>
-                                <?php endif; ?>
                                 <div class="panel panel-default">
                                     <div class="panel-heading">
                                         <h4 class="request panel-title"
@@ -150,58 +159,57 @@ class="btn btn-default curl"
                                             <span class="glyphicon indicator glyphicon-menu-down pull-right"></span>
                                         </h4>
                                     </div>
+                                    <?php if (isset($transition->request)): ?>
                                     <div class="collapse in request-panel panel-body"
                                          id="request-coll-<?= $transition->get_href(); ?>">
-                                        <?php if (isset($transition->request)): ?>
-                                            <?php if ($transition->request->headers !== []): ?>
-                                                <h5>Headers</h5>
-                                                <ul class="headers list-unstyled">
-                                                    <?php foreach ($transition->request->headers as $name => $value): ?>
-                                                        <li>
-                                                            <code><span class="attr"><?= $name; ?></span>: <span
-                                                                    class="value"><?= $value; ?></span>
-                                                            </code>
-                                                        </li>
-                                                    <?php endforeach; ?>
-                                                </ul>
-                                            <?php endif; ?>
-                                            <?php if (!empty($transition->request->body)): ?>
-                                                <h5>Body</h5>
-                                                <?php foreach ($transition->request->body as $value): ?>
-                                                    <?php if (is_string($value)): ?>
-                                                        <code class="request-body"><?= $value; ?></code>
-                                                    <?php else: ?>
-                                                        <?php $type =
-                                                            (isset($transition->request->headers['Content-Type'])) ? $transition->request->headers['Content-Type'] : NULL; ?>
-                                                        <?= $value->print_request($type); ?>
-                                                        <?= $value ?>
-                                                    <?php endif; ?>
+                                        <?php if ($transition->url_variables !== []): ?>
+                                            <h5>Example URI</h5>
+                                            <span class="base-url"><?= $this->base_data['HOST']; ?></span>
+                                            <em><?= $transition->build_url(); ?></em>
+                                        <?php endif; ?>
+                                        <?php if ($transition->request->headers !== []): ?>
+                                            <h5>Headers</h5>
+                                            <ul class="headers list-unstyled">
+                                                <?php foreach ($transition->request->headers as $name => $value): ?>
+                                                    <li>
+                                                        <code><span class="attr"><?= $name; ?></span>: <span
+                                                                class="value"><?= $value; ?></span>
+                                                        </code>
+                                                    </li>
                                                 <?php endforeach; ?>
-                                            <?php endif; ?>
-                                            <?php if (!empty($transition->request->struct)): ?>
-                                                <h5>Structure</h5>
-                                                <div class="row">
-                                                    <?php foreach ($transition->request->struct as $value): ?>
-                                                        <?= $value ?>
-                                                    <?php endforeach; ?>
-                                                </div>
-                                            <?php endif; ?>
+                                            </ul>
+                                        <?php endif; ?>
+                                        <?php if (!empty($transition->request->body)): ?>
+                                            <h5>Body</h5>
+                                            <?php foreach ($transition->request->body as $value): ?>
+                                                <?php if (is_string($value)): ?>
+                                                    <code class="request-body"><?= $value; ?></code>
+                                                <?php else: ?>
+                                                    <?php $type =
+                                                        (isset($transition->request->headers['Content-Type'])) ? $transition->request->headers['Content-Type'] : null; ?>
+                                                    <?= $value->print_request($type); ?>
+                                                    <?= $value ?>
+                                                <?php endif; ?>
+                                            <?php endforeach; ?>
+                                        <?php endif; ?>
+                                        <?php if (!empty($transition->request->struct)): ?>
+                                            <h5>Structure</h5>
+                                            <div class="row">
+                                                <?= $transition->request->struct ?>
+                                            </div>
+                                        <?php endif; ?>
                                         <?php endif; ?>
 
-                                        <?php if ($transition->url_variables !== []): ?>
+                                        <?php if ($transition->url_variables !== null): ?>
                                             <h5>URI Parameters</h5>
-                                            <dl class="dl-horizontal">
-                                                <?php foreach ($transition->url_variables as $value): ?>
-                                                    <?= $value; ?>
-                                                <?php endforeach; ?>
-                                            </dl>
+                                            <div class="row">
+                                                <?= $transition->url_variables; ?>
+                                            </div>
                                         <?php endif; ?>
 
-                                        <?php if ($transition->data_variables !== []): ?>
+                                        <?php if ($transition->data_variables !== null): ?>
                                             <h5>Data object</h5>
-                                            <?php foreach ($transition->data_variables as $value): ?>
-                                                <?= $value ?>
-                                            <?php endforeach; ?>
+                                            <?= $transition->data_variables ?>
                                         <?php endif; ?>
                                     </div>
                                 </div>
@@ -243,8 +251,10 @@ class="value"><?= $value; ?></span>
                                                 <?php foreach ($response->content as $key => $value): ?>
                                                     <div>
                                                         <?php $href =
-                                                            $transition->get_href() . '-' . $response->statuscode . '-' . str_replace(['/',
-                                                                                                                                       '+'], '-', $key); ?>
+                                                            $transition->get_href() . '-' . $response->statuscode . '-' . str_replace([
+                                                                '/',
+                                                                '+',
+                                                            ], '-', $key); ?>
                                                         <h5 class="response-body"
                                                             data-toggle="collapse"
                                                             data-target="#request-<?= $href ?>">
@@ -285,6 +295,9 @@ class="value"><?= $value; ?></span>
         </div>
     </div>
 </div>
+<?php foreach ($this->js as $js): ?>
+    <script src="<?= $js ?>"></script>
+<?php endforeach; ?>
 <script src="https://code.jquery.com/jquery-2.2.4.min.js"
         integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
         crossorigin="anonymous"></script>
diff --git a/src/PHPDraft/Out/Minifier.php b/src/PHPDraft/Out/Minifier.php
index ccdb4eef..a5c59c4a 100644
--- a/src/PHPDraft/Out/Minifier.php
+++ b/src/PHPDraft/Out/Minifier.php
@@ -17,32 +17,81 @@ class Minifier
 
     const X = "\x1A";
 
-
     /**
-     * Generic minify cleanup. Prepends whitespace with a chosen character
+     * Minify given HTML
      *
-     * @param string $input Input to prepend whitespace for
+     * @param string $input input to minify
      *
      * @return string
      */
-    protected static function __minify_x($input)
+    public static function minify_html($input)
     {
-        return str_replace(["\n", "\t", ' '], [self::X . '\n', self::X . '\t', self::X . '\s'], $input);
+        if (!$input = trim($input)) {
+            return $input;
+        }
+        // Keep important white-space(s) after self-closing HTML tag(s)
+        $input = preg_replace('#(<(?:img|input)(?:\s[^<>]*?)?\s*\/?>)\s+#i', '$1' . self::X . '\s', $input);
+        // Create chunk(s) of HTML tag(s), ignored HTML group(s), HTML comment(s) and text
+        $input  =
+            preg_split('#(' . self::CH . '|<pre(?:>|\s[^<>]*?>)[\s\S]*?<\/pre>|<code(?:>|\s[^<>]*?>)[\s\S]*?<\/code>|<script(?:>|\s[^<>]*?>)[\s\S]*?<\/script>|<style(?:>|\s[^<>]*?>)[\s\S]*?<\/style>|<textarea(?:>|\s[^<>]*?>)[\s\S]*?<\/textarea>|<[^<>]+?>)#i',
+                $input, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+        $output = "";
+        foreach ($input as $v) {
+            if ($v !== ' ' && trim($v) === "") {
+                continue;
+            }
+            if ($v[0] === '<' && substr($v, -1) === '>') {
+                if ($v[1] === '!' && strpos($v, '<!--') === 0) { // HTML comment ...
+                    // Remove if not detected as IE comment(s) ...
+                    if (substr($v, -12) !== '<![endif]-->') {
+                        continue;
+                    }
+                    $output .= $v;
+                } else {
+                    $output .= self::__minify_x(self::_minify_html($v));
+                }
+            } else {
+                // Force line-break with `&#10;` or `&#xa;`
+                $v = str_replace(['&#10;', '&#xA;', '&#xa;'], self::X . '\n', $v);
+                // Force white-space with `&#32;` or `&#x20;`
+                $v = str_replace(['&#32;', '&#x20;'], self::X . '\s', $v);
+                // Replace multiple white-space(s) with a space
+                $output .= preg_replace('#\s+#', ' ', $v);
+            }
+        }
+        // Clean up ...
+        $output = preg_replace(
+            [
+                // Remove two or more white-space(s) between tag [^1]
+                '#>([\n\r\t]\s*|\s{2,})<#',
+                // Remove white-space(s) before tag-close [^2]
+                '#\s+(<\/[^\s]+?>)#',
+            ],
+            [
+                // [^1]
+                '><',
+                // [^2]
+                '$1',
+            ],
+            $output);
+        $output = self::__minify_v($output);
+
+        // Remove white-space(s) after ignored tag-open and before ignored tag-close (except `<textarea>`)
+        return preg_replace('#<(code|pre|script|style)(>|\s[^<>]*?>)\s*([\s\S]*?)\s*<\/\1>#i', '<$1$2$3</$1>', $output);
     }
 
     /**
-     * Generic minify cleanup. Removes chosen character from prepended whitespace
+     * Generic minify cleanup. Prepends whitespace with a chosen character
      *
-     * @param string $input Input to change whitespace for
+     * @param string $input Input to prepend whitespace for
      *
      * @return string
      */
-    protected static function __minify_v($input)
+    protected static function __minify_x($input)
     {
-        return str_replace([self::X . '\n', self::X . '\t', self::X . '\s'], ["\n", "\t", ' '], $input);
+        return str_replace(["\n", "\t", ' '], [self::X . '\n', self::X . '\t', self::X . '\s'], $input);
     }
 
-
     /**
      * Part of the HTML minification process
      *
@@ -52,15 +101,11 @@ protected static function __minify_v($input)
      */
     protected static function _minify_html($input)
     {
-        return preg_replace_callback('#<\s*([^\/\s]+)\s*(?:>|(\s[^<>]+?)\s*>)#', function ($m)
-        {
-            if (isset($m[2]))
-            {
+        return preg_replace_callback('#<\s*([^\/\s]+)\s*(?:>|(\s[^<>]+?)\s*>)#', function ($m) {
+            if (isset($m[2])) {
                 // Minify inline CSS declaration(s)
-                if (stripos($m[2], ' style=') !== FALSE)
-                {
-                    $m[2] = preg_replace_callback('#( style=)([\'"]?)(.*?)\2#i', function ($m)
-                    {
+                if (stripos($m[2], ' style=') !== false) {
+                    $m[2] = preg_replace_callback('#( style=)([\'"]?)(.*?)\2#i', function ($m) {
                         return $m[1] . $m[2] . self::minify_css($m[3]) . $m[2];
                     }, $m[2]);
                 }
@@ -90,78 +135,57 @@ protected static function _minify_html($input)
     }
 
     /**
-     * Minify given HTML
+     * Minify given CSS
      *
      * @param string $input input to minify
      *
      * @return string
      */
-    public static function minify_html($input)
+    public static function minify_css($input)
     {
-        if (!$input = trim($input))
-        {
+        if (!$input = trim($input)) {
             return $input;
         }
-        // Keep important white-space(s) after self-closing HTML tag(s)
-        $input = preg_replace('#(<(?:img|input)(?:\s[^<>]*?)?\s*\/?>)\s+#i', '$1' . self::X . '\s', $input);
-        // Create chunk(s) of HTML tag(s), ignored HTML group(s), HTML comment(s) and text
+        // Keep important white-space(s) between comment(s)
+        $input = preg_replace('#(' . self::CC . ')\s+(' . self::CC . ')#', '$1' . self::X . '\s$2', $input);
+        // Create chunk(s) of string(s), comment(s) and text
         $input  =
-            preg_split('#(' . self::CH . '|<pre(?:>|\s[^<>]*?>)[\s\S]*?<\/pre>|<code(?:>|\s[^<>]*?>)[\s\S]*?<\/code>|<script(?:>|\s[^<>]*?>)[\s\S]*?<\/script>|<style(?:>|\s[^<>]*?>)[\s\S]*?<\/style>|<textarea(?:>|\s[^<>]*?>)[\s\S]*?<\/textarea>|<[^<>]+?>)#i', $input, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+            preg_split('#(' . self::SS . '|' . self::CC . ')#', $input, -1,
+                PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
         $output = "";
-        foreach ($input as $v)
-        {
-            if ($v !== ' ' && trim($v) === "")
-            {
+        foreach ($input as $v) {
+            if (trim($v) === "") {
                 continue;
             }
-            if ($v[0] === '<' && substr($v, -1) === '>')
-            {
-                if ($v[1] === '!' && strpos($v, '<!--') === 0)
-                { // HTML comment ...
-                    // Remove if not detected as IE comment(s) ...
-                    if (substr($v, -12) !== '<![endif]-->')
-                    {
-                        continue;
-                    }
-                    $output .= $v;
-                }
-                else
-                {
-                    $output .= self::__minify_x(self::_minify_html($v));
+            if (
+                ($v[0] === '"' && substr($v, -1) === '"') ||
+                ($v[0] === "'" && substr($v, -1) === "'") ||
+                (strpos($v, '/*') === 0 && substr($v, -2) === '*/')
+            ) {
+                // Remove if not detected as important comment ...
+                if ($v[0] === '/' && strpos($v, '/*!') !== 0) {
+                    continue;
                 }
-            }
-            else
-            {
-                // Force line-break with `&#10;` or `&#xa;`
-                $v = str_replace(['&#10;', '&#xA;', '&#xa;'], self::X . '\n', $v);
-                // Force white-space with `&#32;` or `&#x20;`
-                $v = str_replace(['&#32;', '&#x20;'], self::X . '\s', $v);
-                // Replace multiple white-space(s) with a space
-                $output .= preg_replace('#\s+#', ' ', $v);
+                $output .= $v; // String or comment ...
+            } else {
+                $output .= self::_minify_css($v);
             }
         }
-        // Clean up ...
+        // Remove quote(s) where possible ...
         $output = preg_replace(
             [
-                // Remove two or more white-space(s) between tag [^1]
-                '#>([\n\r\t]\s*|\s{2,})<#',
-                // Remove white-space(s) before tag-close [^2]
-                '#\s+(<\/[^\s]+?>)#',
+                // '#(' . self::CC . ')|(?<!\bcontent\:|[\s\(])([\'"])([a-z_][-\w]*?)\2#i',
+                '#(' . self::CC . ')|\b(url\()([\'"])([^\s]+?)\3(\))#i',
             ],
             [
-                // [^1]
-                '><',
-                // [^2]
-                '$1',
+                // '$1$3',
+                '$1$2$4$5',
             ],
             $output);
-        $output = self::__minify_v($output);
 
-        // Remove white-space(s) after ignored tag-open and before ignored tag-close (except `<textarea>`)
-        return preg_replace('#<(code|pre|script|style)(>|\s[^<>]*?>)\s*([\s\S]*?)\s*<\/\1>#i', '<$1$2$3</$1>', $output);
+        return self::__minify_v($output);
     }
 
-
     /**
      * Part of the CSS minification process
      *
@@ -172,10 +196,8 @@ public static function minify_html($input)
     protected static function _minify_css($input)
     {
         // Keep important white-space(s) in `calc()`
-        if (stripos($input, 'calc(') !== FALSE)
-        {
-            $input = preg_replace_callback('#\b(calc\()\s*(.*?)\s*\)#i', function ($m)
-            {
+        if (stripos($input, 'calc(') !== false) {
+            $input = preg_replace_callback('#\b(calc\()\s*(.*?)\s*\)#i', function ($m) {
                 return $m[1] . preg_replace('#\s+#', self::X . '\s', $m[2]) . ')';
             }, $input);
         }
@@ -186,7 +208,9 @@ protected static function _minify_css($input)
                 // Fix case for `#foo [bar="baz"]` and `#foo :first-child` [^1]
                 '#(?<![,\{\}])\s+(\[|:\w)#',
                 // Fix case for `[bar="baz"] .foo` and `@media (foo: bar) and (baz: qux)` [^2]
-                '#\]\s+#', '#\b\s+\(#', '#\)\s+\b#',
+                '#\]\s+#',
+                '#\b\s+\(#',
+                '#\)\s+\b#',
                 // Minify HEX color code ... [^3]
                 '#\#([\da-f])\1([\da-f])\2([\da-f])\3\b#i',
                 // Remove white-space(s) around punctuation(s) [^4]
@@ -212,7 +236,9 @@ protected static function _minify_css($input)
                 // [^1]
                 self::X . '\s$1',
                 // [^2]
-                ']' . self::X . '\s', self::X . '\s(', ')' . self::X . '\s',
+                ']' . self::X . '\s',
+                self::X . '\s(',
+                ')' . self::X . '\s',
                 // [^3]
                 '#$1$2$3',
                 // [^4]
@@ -238,64 +264,71 @@ protected static function _minify_css($input)
     }
 
     /**
-     * Minify given CSS
+     * Generic minify cleanup. Removes chosen character from prepended whitespace
+     *
+     * @param string $input Input to change whitespace for
+     *
+     * @return string
+     */
+    protected static function __minify_v($input)
+    {
+        return str_replace([self::X . '\n', self::X . '\t', self::X . '\s'], ["\n", "\t", ' '], $input);
+    }
+
+    /**
+     * Minify given JS
      *
      * @param string $input input to minify
      *
      * @return string
      */
-    public static function minify_css($input)
+    public static function minify_js($input)
     {
-        if (!$input = trim($input))
-        {
+        if (!$input = trim($input)) {
             return $input;
         }
-        // Keep important white-space(s) between comment(s)
-        $input = preg_replace('#(' . self::CC . ')\s+(' . self::CC . ')#', '$1' . self::X . '\s$2', $input);
-        // Create chunk(s) of string(s), comment(s) and text
+        // Create chunk(s) of string(s), comment(s), regex(es) and text
         $input  =
-            preg_split('#(' . self::SS . '|' . self::CC . ')#', $input, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+            preg_split('#(' . self::SS . '|' . self::CC . '|\/[^\n]+?\/(?=[.,;]|[gimuy]|$))#', $input, -1,
+                PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
         $output = "";
-        foreach ($input as $v)
-        {
-            if (trim($v) === "")
-            {
+        foreach ($input as $v) {
+            if (trim($v) === "") {
                 continue;
             }
             if (
                 ($v[0] === '"' && substr($v, -1) === '"') ||
                 ($v[0] === "'" && substr($v, -1) === "'") ||
-                (strpos($v, '/*') === 0 && substr($v, -2) === '*/')
-            )
-            {
+                ($v[0] === '/' && substr($v, -1) === '/')
+            ) {
                 // Remove if not detected as important comment ...
-                if ($v[0] === '/' && strpos($v, '/*!') !== 0)
-                {
+                if (strpos($v, '//') === 0 || (strpos($v, '/*') === 0 && strpos($v, '/*!') !== 0 && strpos($v,
+                            '/*@cc_on') !== 0)
+                ) {
                     continue;
                 }
-                $output .= $v; // String or comment ...
-            }
-            else
-            {
-                $output .= self::_minify_css($v);
+                $output .= $v; // String, comment or regex ...
+            } else {
+                $output .= self::_minify_js($v);
             }
         }
-        // Remove quote(s) where possible ...
-        $output = preg_replace(
+
+        return preg_replace(
             [
-                // '#(' . self::CC . ')|(?<!\bcontent\:|[\s\(])([\'"])([a-z_][-\w]*?)\2#i',
-                '#(' . self::CC . ')|\b(url\()([\'"])([^\s]+?)\3(\))#i',
+                // Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}` [^1]
+                '#(' . self::CC . ')|([\{,])([\'])(\d+|[a-z_]\w*)\3(?=:)#i',
+                // From `foo['bar']` to `foo.bar` [^2]
+                '#([\w\)\]])\[([\'"])([a-z_]\w*)\2\]#i',
             ],
             [
-                // '$1$3',
-                '$1$2$4$5',
+                // [^1]
+                '$1$2$4',
+                // [^2]
+                '$1.$3',
             ],
             $output);
-
-        return self::__minify_v($output);
     }
 
-
     /**
      * Part of the JS minification process
      *
@@ -314,7 +347,9 @@ protected static function _minify_js($input)
                 // Remove the last semi-colon and comma [^3]
                 '#[;,]([\]\}])#',
                 // Replace `true` with `!0` and `false` with `!1` [^4]
-                '#\btrue\b#', '#\bfalse\b#', '#\breturn\s+#',
+                '#\btrue\b#',
+                '#\bfalse\b#',
+                '#\breturn\s+#',
             ],
             [
                 // [^1]
@@ -324,66 +359,10 @@ protected static function _minify_js($input)
                 // [^3]
                 '$1',
                 // [^4]
-                '!0', '!1', 'return ',
+                '!0',
+                '!1',
+                'return ',
             ],
             $input);
     }
-
-    /**
-     * Minify given JS
-     *
-     * @param string $input input to minify
-     *
-     * @return string
-     */
-    public static function minify_js($input)
-    {
-        if (!$input = trim($input))
-        {
-            return $input;
-        }
-        // Create chunk(s) of string(s), comment(s), regex(es) and text
-        $input  =
-            preg_split('#(' . self::SS . '|' . self::CC . '|\/[^\n]+?\/(?=[.,;]|[gimuy]|$))#', $input, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-        $output = "";
-        foreach ($input as $v)
-        {
-            if (trim($v) === "")
-            {
-                continue;
-            }
-            if (
-                ($v[0] === '"' && substr($v, -1) === '"') ||
-                ($v[0] === "'" && substr($v, -1) === "'") ||
-                ($v[0] === '/' && substr($v, -1) === '/')
-            )
-            {
-                // Remove if not detected as important comment ...
-                if (strpos($v, '//') === 0 || (strpos($v, '/*') === 0 && strpos($v, '/*!') !== 0 && strpos($v, '/*@cc_on') !== 0))
-                {
-                    continue;
-                }
-                $output .= $v; // String, comment or regex ...
-            }
-            else
-            {
-                $output .= self::_minify_js($v);
-            }
-        }
-
-        return preg_replace(
-            [
-                // Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}` [^1]
-                '#(' . self::CC . ')|([\{,])([\'])(\d+|[a-z_]\w*)\3(?=:)#i',
-                // From `foo['bar']` to `foo.bar` [^2]
-                '#([\w\)\]])\[([\'"])([a-z_]\w*)\2\]#i',
-            ],
-            [
-                // [^1]
-                '$1$2$4',
-                // [^2]
-                '$1.$3',
-            ],
-            $output);
-    }
 }
\ No newline at end of file
diff --git a/src/PHPDraft/Out/TemplateGenerator.php b/src/PHPDraft/Out/TemplateGenerator.php
index dd38af6e..7ff01511 100644
--- a/src/PHPDraft/Out/TemplateGenerator.php
+++ b/src/PHPDraft/Out/TemplateGenerator.php
@@ -8,38 +8,57 @@
 
 namespace PHPDraft\Out;
 
-use Michelf\Markdown;
+use Michelf\MarkdownExtra;
 use PHPDraft\Model\Category;
 use PHPDraft\Model\Elements\DataStructureElement;
 
 class TemplateGenerator
 {
+    /**
+     * Type of sorting to do on objects
+     *
+     * @var int
+     */
+    public $sorting;
+    /**
+     * CSS Files to load
+     *
+     * @var array
+     */
+    public $css = [];
+    /**
+     * JS Files to load
+     *
+     * @var array
+     */
+    public $js = [];
     /**
      * JSON object of the API blueprint
+     *
      * @var mixed
      */
     protected $categories = [];
-
     /**
      * The template file to load
+     *
      * @var string
      */
     protected $template;
-
     /**
      * The image to use as a logo
+     *
      * @var string
      */
-    protected $image;
-
+    protected $image = null;
     /**
      * The base URl of the API
+     *
      * @var
      */
     protected $base_data;
-
     /**
      * Structures used in all data
+     *
      * @var DataStructureElement[]
      */
     protected $base_structures = [];
@@ -53,7 +72,7 @@ class TemplateGenerator
     public function __construct($template, $image)
     {
         $this->template = $template;
-        $this->image = $image;
+        $this->image    = $image;
     }
 
     /**
@@ -65,54 +84,53 @@ public function __construct($template, $image)
      */
     public function get($object)
     {
-        $include = NULL;
-        if (stream_resolve_include_path($this->template . DIRECTORY_SEPARATOR . $this->template . '.php'))
-        {
+        $include = null;
+        if (stream_resolve_include_path($this->template . DIRECTORY_SEPARATOR . $this->template . '.php')) {
             $include = $this->template . DIRECTORY_SEPARATOR . $this->template . '.php';
         }
 
-        if (stream_resolve_include_path($this->template . '.php'))
-        {
+        if (stream_resolve_include_path($this->template . '.php')) {
             $include = $this->template . '.php';
         }
 
-        if (stream_resolve_include_path('PHPDraft/Out/HTML/' . $this->template . '.php'))
-        {
+        if (stream_resolve_include_path('PHPDraft/Out/HTML/' . $this->template . '.php')) {
             $include = 'PHPDraft/Out/HTML/' . $this->template . '.php';
         }
-        if ($include === NULL)
-        {
+        if ($include === null) {
             file_put_contents('php://stderr', "Couldn't find template '$this->template'\n");
             exit(1);
         }
 
         //Prepare base data
-        if (is_array($object->content[0]->content))
-        {
-            foreach ($object->content[0]->attributes->meta as $meta)
-            {
+        if (is_array($object->content[0]->content)) {
+            foreach ($object->content[0]->attributes->meta as $meta) {
                 $this->base_data[$meta->content->key->content] = $meta->content->value->content;
             }
-            foreach ($object->content[0]->content as $value)
-            {
-                if ($value->element === 'copy')
-                {
+            foreach ($object->content[0]->content as $value) {
+                if ($value->element === 'copy') {
                     $this->base_data['DESC'] =
-                        preg_replace('/(<\/?p>)/', '', Markdown::defaultTransform($value->content), 2);
+                        preg_replace('/(<\/?p>)/', '', MarkdownExtra::defaultTransform($value->content), 2);
                     continue;
                 }
 
                 $cat                = new Category();
                 $this->categories[] = $cat->parse($value);
 
-                if ($value->meta->classes[0] === 'dataStructures')
-                {
-                    $this->base_structures = $cat->structures;
+                if ($value->meta->classes[0] === 'dataStructures') {
+                    $this->base_structures = array_merge($this->base_structures, $cat->structures);
                 }
             }
 
             $this->base_data['TITLE'] = $object->content[0]->meta->title;
         }
+        if ($this->sorting === UI::$PHPD_SORT_OPT_ALL || $this->sorting === UI::$PHPD_SORT_OPT_STRUCTURES) {
+            ksort($this->base_structures);
+        }
+        if ($this->sorting === UI::$PHPD_SORT_OPT_ALL || $this->sorting === UI::$PHPD_SORT_OPT_WEBSERVICES) {
+            usort($this->categories[0]->children, function ($a, $b) {
+                return strcmp($a->title, $b->title);
+            });
+        }
 
         include_once $include;
     }
@@ -126,8 +144,7 @@ public function get($object)
      */
     function get_method_icon($method)
     {
-        switch (strtolower($method))
-        {
+        switch (strtolower($method)) {
             case 'post':
                 $class = 'glyphicon glyphicon-plus';
                 break;
@@ -156,23 +173,18 @@ function get_method_icon($method)
      */
     function get_response_status($response)
     {
-        if ($response <= 299)
-        {
+        if ($response <= 299) {
             return 'text-success';
-        }
-        elseif ($response > 299 && $response <= 399)
-        {
+        } elseif ($response > 299 && $response <= 399) {
             return 'text-warning';
-        }
-        else
-        {
+        } else {
             return 'text-error';
         }
     }
 
     function strip_link_spaces($key)
     {
-        return str_replace(' ', '__', strtolower($key));
+        return str_replace(' ', '-', strtolower($key));
     }
 
 }
\ No newline at end of file
diff --git a/src/PHPDraft/Out/UI.php b/src/PHPDraft/Out/UI.php
index 408d50d8..8db369d9 100644
--- a/src/PHPDraft/Out/UI.php
+++ b/src/PHPDraft/Out/UI.php
@@ -15,66 +15,93 @@
 
 class UI
 {
+    public static $PHPD_SORT_OPT_ALL = 3;
+    public static $PHPD_SORT_OPT_WEBSERVICES = 2;
+    public static $PHPD_SORT_OPT_STRUCTURES = 1;
     protected $versionStringPrinted;
 
     static function main($argv = [])
     {
-        $options = getopt("f:t::i::hvu");
-        if(!isset($argv[1]))
-        {
-            file_put_contents('php://stderr', 'Not enough arguments'.PHP_EOL);
+        $options = getopt("f:t:i:c:j:s:hvu");
+        if (!isset($argv[1])) {
+            file_put_contents('php://stderr', 'Not enough arguments' . PHP_EOL);
             self::help();
             exit(1);
         }
+        $sorting = -1;
+        if (isset($options['s'])) {
+            $value = strtoupper($options['s']);
+            if (isset(UI::${'PHPD_SORT_OPT_' . $value})) {
+                $sorting = UI::${'PHPD_SORT_OPT_' . $value};
+            }
+        }
 
-        if (boolval(preg_match('/^\-/',$argv[1])))
-        {
-            if (isset($options['h']))
-            {
+        if (boolval(preg_match('/^\-/', $argv[1]))) {
+            if (isset($options['h'])) {
                 self::help();
                 exit(0);
             }
 
-            if (isset($options['v']))
-            {
+            if (isset($options['v'])) {
                 self::version();
                 exit(0);
             }
 
-            if (isset($options['u']))
-            {
+            if (isset($options['u'])) {
                 self::handleSelfUpdate();
                 exit(0);
-            }
-
-            elseif (isset($options['f']))
-            {
+            } elseif (isset($options['f'])) {
                 $file = $options['f'];
-            }
-            else
-            {
-                file_put_contents('php://stderr', 'No file to parse'.PHP_EOL);
+            } else {
+                file_put_contents('php://stderr', 'No file to parse' . PHP_EOL);
                 exit(1);
             }
-        }
-        else
-        {
+        } else {
             $file = $argv[1];
         }
 
-        $template = (isset($options['t']) && $options['t']) ? $options['t']: 'default';
-        $image = (isset($options['i']) && $options['i']) ? $options['i']: NULL;
+        $template = (isset($options['t']) && $options['t']) ? $options['t'] : 'default';
+        $image    = (isset($options['i']) && $options['i']) ? $options['i'] : null;
+        $css      = (isset($options['c']) && $options['c']) ? $options['i'] : null;
+        $js       = (isset($options['j']) && $options['j']) ? $options['i'] : null;
 
         return [
-            'file' => $file,
+            'file'     => $file,
             'template' => $template,
-            'image' => $image
+            'image'    => $image,
+            'css'      => $css,
+            'js'       => $js,
+            'sorting'  => $sorting,
         ];
     }
 
-    private function printVersionString()
+    static function help()
     {
-        print self::version() . "\n\n";
+        echo 'This is a parser for API Blueprint files in PHP.' . PHP_EOL . PHP_EOL;
+        echo "The following options can be used:.\n";
+        echo "\t-f\tSpecifies the file to parse.\n";
+        echo "\t-t\tSpecifies the template to use. (defaults to 'default')\n";
+        echo "\t-s\tSort displayed values [All|None|Structures|Webservices] (defaults to the way the objects are in the file)\n";
+        echo "\t-i\tSpecifies an image to display in the header.\n";
+        echo "\t-c\tSpecifies a CSS file to include (value is put in a link element without checking).\n";
+        echo "\t-c\tSpecifies a JS file to include (value is put in a script element without checking).\n";
+        echo "\t-h\tDisplays this text.\n";
+    }
+
+    static function version()
+    {
+        $version = self::release_id();
+        echo 'PHPDraft: ' . $version;
+    }
+
+    /**
+     * Get the version number
+     *
+     * @return string
+     */
+    static function release_id()
+    {
+        return (VERSION === '0') ? @exec('git describe --tags 2>&1') : VERSION;
     }
 
     /**
@@ -95,17 +122,18 @@ protected function handleSelfUpdate()
         //set POST variables
         //https://github.com/SMillerDev/phpdraft/releases/download/1.3.2/phpdraft.phar
         $url = 'https://github.com/SMillerDev/phpdraft/releases/latest';
-        $ch = curl_init();
-        curl_setopt($ch,CURLOPT_URL, $url);
+        $ch  = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        $result = curl_exec($ch);
+        $result  = curl_exec($ch);
         $matches = [];
-        preg_match("/href=\"https:\/\/github.com\/SMillerDev\/phpdraft\/releases\/tag\/([0-9.]*)\"/", $result, $matches);
+        preg_match("/href=\"https:\/\/github.com\/SMillerDev\/phpdraft\/releases\/tag\/([0-9.]*)\"/", $result,
+            $matches);
         curl_close($ch);
-            $remoteFilename = sprintf(
-                'https://github.com/SMillerDev/phpdraft/releases/download/%s/phpdraft.phar',
-                $matches[0]
-            );
+        $remoteFilename = sprintf(
+            'https://github.com/SMillerDev/phpdraft/releases/download/%s/phpdraft.phar',
+            $matches[0]
+        );
 
         $tempFilename = tempnam(sys_get_temp_dir(), 'phpdraft') . '.phar';
         // Workaround for https://bugs.php.net/bug.php?id=65538
@@ -116,8 +144,8 @@ protected function handleSelfUpdate()
             'ssl' => [
                 'allow_self_signed' => false,
                 'cafile'            => $caFile,
-                'verify_peer'       => true
-            ]
+                'verify_peer'       => true,
+            ],
         ];
         file_put_contents(
             $tempFilename,
@@ -147,49 +175,12 @@ protected function handleSelfUpdate()
         print " done\n";
         exit(0);
     }
-    /**
-     * @since Method available since Release 1.4
-     */
-    protected function handleVersionCheck()
-    {
-        $this->printVersionString();
-        $latestVersion = file_get_contents('https://phar.phpdraft.de/latest-version-of/phpdraft');
-        $isOutdated    = version_compare($latestVersion, self::release_id(), '>');
-        if ($isOutdated) {
-            print "You are not using the latest version of PHPDraft.\n";
-            print 'Use "phpdraft --self-upgrade" to install PHPDraft ' . $latestVersion . "\n";
-        } else {
-            print "You are using the latest version of PHPDraft.\n";
-        }
-        exit(0);
-    }
-
-    static function help()
-    {
-        echo 'This is a parser for API Blueprint files in PHP.'.PHP_EOL.PHP_EOL;
-        echo "The following options can be used:.\n";
-        echo "\t-f\tSpecifies the file to parse.\n";
-        echo "\t-t\tSpecifies the template to use. (defaults to 'default')\n";
-        echo "\t-h\tDisplays this text.\n";
-    }
-
-    static function version()
-    {
-        $version = self::release_id();
-        echo 'PHPDraft: '.$version;
-    }
 
-    /**
-     * Get the version number
-     *
-     * @return string
-     */
-    static function release_id()
+    private function printVersionString()
     {
-        return (VERSION === '0') ? @exec('git describe --tags 2>&1') : VERSION;
+        print self::version() . "\n\n";
     }
 
-
     /**
      * @return string
      *
@@ -202,6 +193,7 @@ public static function series()
         } else {
             $version = self::release_id();
         }
+
         return implode('.', array_slice(explode('.', $version), 0, 2));
     }
 
@@ -215,6 +207,24 @@ public static function getReleaseChannel()
         if (strpos(self::release_id(), '-') !== false) {
             return '-nightly';
         }
+
         return '';
     }
+
+    /**
+     * @since Method available since Release 1.4
+     */
+    protected function handleVersionCheck()
+    {
+        $this->printVersionString();
+        $latestVersion = file_get_contents('https://phar.phpdraft.de/latest-version-of/phpdraft');
+        $isOutdated    = version_compare($latestVersion, self::release_id(), '>');
+        if ($isOutdated) {
+            print "You are not using the latest version of PHPDraft.\n";
+            print 'Use "phpdraft --self-upgrade" to install PHPDraft ' . $latestVersion . "\n";
+        } else {
+            print "You are using the latest version of PHPDraft.\n";
+        }
+        exit(0);
+    }
 }
\ No newline at end of file
diff --git a/src/PHPDraft/Parse/Drafter.php b/src/PHPDraft/Parse/Drafter.php
index 43194d72..9465e8cc 100644
--- a/src/PHPDraft/Parse/Drafter.php
+++ b/src/PHPDraft/Parse/Drafter.php
@@ -43,15 +43,14 @@ class Drafter
      */
     public function __construct($apib)
     {
-        $this->apib   = $apib;
+        $this->apib = $apib;
 
-        if (!$this->location())
-        {
+        if (!$this->location()) {
             throw new \RuntimeException("Drafter was not installed!", 1);
         }
         $this->drafter = $this->location();
 
-        $this->tmp_dir = sys_get_temp_dir().'/drafter';
+        $this->tmp_dir = sys_get_temp_dir() . '/drafter';
     }
 
     /**
@@ -64,7 +63,7 @@ function location()
         $returnVal = shell_exec('which drafter 2> /dev/null');
         $returnVal = preg_replace('/^\s+|\n|\r|\s+$/m', '', $returnVal);
 
-        return (empty($returnVal) ? FALSE : $returnVal);
+        return (empty($returnVal) ? false : $returnVal);
     }
 
     /**
@@ -74,8 +73,7 @@ function location()
      */
     public function parseToJson()
     {
-        if (!file_exists($this->tmp_dir))
-        {
+        if (!file_exists($this->tmp_dir)) {
             mkdir($this->tmp_dir);
         }
 
@@ -84,25 +82,21 @@ public function parseToJson()
         shell_exec($this->drafter . ' ' . $this->tmp_dir . '/index.apib -f json -o ' . $this->tmp_dir . '/index.json 2> /dev/null');
         $this->json = json_decode(file_get_contents($this->tmp_dir . '/index.json'));
 
-        if (json_last_error() !== JSON_ERROR_NONE)
-        {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             file_put_contents('php://stdout', "ERROR: invalid json in " . $this->tmp_dir . '/index.json');
             throw new \RuntimeException("Drafter generated invalid JSON (" . json_last_error_msg() . ")", 2);
         }
 
-        $warnings = FALSE;
-        foreach ($this->json->content as $item)
-        {
-            if ($item->element === 'annotation')
-            {
-                $warnings = TRUE;
+        $warnings = false;
+        foreach ($this->json->content as $item) {
+            if ($item->element === 'annotation') {
+                $warnings = true;
                 $prefix   = strtoupper($item->meta->classes[0]);
                 $error    = $item->content;
                 file_put_contents('php://stdout', "$prefix: $error\n");
             }
         }
-        if ($warnings)
-        {
+        if ($warnings) {
             throw new \RuntimeException("Parsing encountered errors and stopped", 2);
         }
 
diff --git a/src/PHPDraft/Parse/JsonToHTML.php b/src/PHPDraft/Parse/JsonToHTML.php
index 4c7c6693..b8f02461 100644
--- a/src/PHPDraft/Parse/JsonToHTML.php
+++ b/src/PHPDraft/Parse/JsonToHTML.php
@@ -12,6 +12,13 @@
 
 class JsonToHTML
 {
+    /**
+     * Type of sorting to do
+     *
+     * @var int
+     */
+    public $sorting;
+
     /**
      * JSON representation of an API Blueprint
      *
@@ -42,16 +49,21 @@ function __toString()
     /**
      * Get the HTML representation of the JSON object
      *
-     * @param string $template Type of template to display.
-     *
-     * @param string $image    Image to use as a logo
+     * @param string      $template Type of template to display.
+     * @param string|null $image    Image to use as a logo
+     * @param string|null $css      CSS to load
+     * @param string|null $js       JS to load
      *
      * @return string HTML template to display
      */
-    public function get_html($template = 'default', $image = NULL)
+    public function get_html($template = 'default', $image = null, $css = null, $js = null)
     {
         $gen = new TemplateGenerator($template, $image);
 
+        $gen->css[]   = $css;
+        $gen->js[]    = $js;
+        $gen->sorting = $this->sorting;
+
         return $gen->get($this->object);
     }
 
diff --git a/src/PHPDraft/Parse/Tests/DrafterTest.php b/src/PHPDraft/Parse/Tests/DrafterTest.php
index 1109d81d..88e646d0 100644
--- a/src/PHPDraft/Parse/Tests/DrafterTest.php
+++ b/src/PHPDraft/Parse/Tests/DrafterTest.php
@@ -24,7 +24,7 @@ class DrafterTest extends BaseTest
      */
     public function setUp()
     {
-        $this->mock_function('sys_get_temp_dir', 'return "'.TEST_STATICS.'";');
+        $this->mock_function('sys_get_temp_dir', 'return "' . TEST_STATICS . '";');
         $this->mock_function('shell_exec', 'return "/some/dir/drafter\n";');
         $this->class      = new Drafter(file_get_contents(TEST_STATICS . '/drafter/apib'));
         $this->reflection = new ReflectionClass('PHPDraft\Parse\Drafter');
@@ -47,7 +47,7 @@ public function tearDown()
     public function testSetupCorrectly()
     {
         $property = $this->reflection->getProperty('apib');
-        $property->setAccessible(TRUE);
+        $property->setAccessible(true);
         $this->assertEquals(file_get_contents(TEST_STATICS . '/drafter/apib'), $property->getValue($this->class));
     }
 
@@ -65,24 +65,25 @@ public function testPreRunStringIsEmpty()
     public function testParseToJSON()
     {
         $this->mock_function('shell_exec', 'return "";');
-        file_put_contents(TEST_STATICS.'/drafter/index.json', file_get_contents(TEST_STATICS.'/drafter/json'));
+        file_put_contents(TEST_STATICS . '/drafter/index.json', file_get_contents(TEST_STATICS . '/drafter/json'));
         $this->class->parseToJson();
-        $this->assertEquals(json_decode(file_get_contents(TEST_STATICS.'/drafter/json')), $this->class->json);
+        $this->assertEquals(json_decode(file_get_contents(TEST_STATICS . '/drafter/json')), $this->class->json);
         $this->unmock_function('shell_exec');
     }
 
     /**
      * Check if parsing the APIB to JSON gives the expected result
      *
-     * @covers                   PHPDraft\Parse\Drafter::parseToJson()
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Parsing encountered errors and stopped
-     * @expectedExceptionCode    2
+     * @covers                      PHPDraft\Parse\Drafter::parseToJson()
+     * @expectedException           \RuntimeException
+     * @expectedExceptionMessage    Parsing encountered errors and stopped
+     * @expectedExceptionCode       2
      */
     public function testParseToJSONWithErrors()
     {
         $this->mock_function('shell_exec', 'return "";');
-        file_put_contents(TEST_STATICS.'/drafter/index.json', file_get_contents(TEST_STATICS.'/drafter/json_errors'));
+        file_put_contents(TEST_STATICS . '/drafter/index.json',
+            file_get_contents(TEST_STATICS . '/drafter/json_errors'));
         $this->class->parseToJson();
         $this->expectOutputString("WARNING: ignoring unrecognized block\nWARNING: no headers specified\nWARNING: ignoring unrecognized block\nWARNING: empty request message-body");
         $this->unmock_function('shell_exec');
@@ -113,7 +114,7 @@ public function testSetupWithoutDrafter()
      */
     public function testParseToJSONWithInvalidJSON()
     {
-        $this->mock_function('json_last_error', 'return '.JSON_ERROR_DEPTH.';');
+        $this->mock_function('json_last_error', 'return ' . JSON_ERROR_DEPTH . ';');
         $this->mock_function('json_last_error_msg', 'return "ERROR";');
         $this->class->parseToJson();
         $this->expectOutputString("ERROR: invalid json in /tmp/drafter/index.json");
diff --git a/tests/statics/drafter/apib b/tests/statics/drafter/apib
index b3d5746e..1c33b02e 100644
--- a/tests/statics/drafter/apib
+++ b/tests/statics/drafter/apib
@@ -571,8 +571,8 @@ Set the temperature target for the HVAC system.
 + Parameters
 
     + vehicle_id: `1` (number) - The id of the Vehicle.
-    + driver_degC: `23.7` (number) - The desired temperature on the driver's side in celcius.
-    + pass_degC: `18.1` (number) - The desired temperature on the passenger's side in celcius.
+    + driver_degC: `23.7` (number) - The desired temperature on the driver's side in °C.
+    + pass_degC: `18.1` (number) - The desired temperature on the passenger's side in °C.
 
 + Response 200 (application/json)
 
diff --git a/tests/statics/drafter/index.apib b/tests/statics/drafter/index.apib
index b3d5746e..1c33b02e 100644
--- a/tests/statics/drafter/index.apib
+++ b/tests/statics/drafter/index.apib
@@ -571,8 +571,8 @@ Set the temperature target for the HVAC system.
 + Parameters
 
     + vehicle_id: `1` (number) - The id of the Vehicle.
-    + driver_degC: `23.7` (number) - The desired temperature on the driver's side in celcius.
-    + pass_degC: `18.1` (number) - The desired temperature on the passenger's side in celcius.
+    + driver_degC: `23.7` (number) - The desired temperature on the driver's side in °C.
+    + pass_degC: `18.1` (number) - The desired temperature on the passenger's side in °C.
 
 + Response 200 (application/json)
 
diff --git a/tests/statics/drafter/json b/tests/statics/drafter/json
index f5015c7e..da207419 100644
--- a/tests/statics/drafter/json
+++ b/tests/statics/drafter/json
@@ -2590,7 +2590,7 @@
                         {
                           "element": "member",
                           "meta": {
-                            "description": "The desired temperature on the driver's side in celcius."
+                            "description": "The desired temperature on the driver's side in °C."
                           },
                           "content": {
                             "key": {
@@ -2606,7 +2606,7 @@
                         {
                           "element": "member",
                           "meta": {
-                            "description": "The desired temperature on the passenger's side in celcius."
+                            "description": "The desired temperature on the passenger's side in °C."
                           },
                           "content": {
                             "key": {