diff --git a/Command/GenerateCommand.php b/Command/GenerateCommand.php
index 6f49ec8..14852ab 100755
--- a/Command/GenerateCommand.php
+++ b/Command/GenerateCommand.php
@@ -79,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         $request->request->url = $request->request->url->raw;
                     }
                     $pageFilename = strtolower($request->request->method) . '_' . str_ireplace(array('/','\\','.',' ','?'),'_', $request->name) . ".html";
-                    $request->page_path = 'requests/' . $pageFilename;
+                    $request->page_path = 'requests/' . $item->name. '-' . $pageFilename;
                     if (!property_exists($request, 'response') ||  !count($request->response)) {
                         $output->writeln("Warning: {$request->name} has no response examples");
                     }
@@ -89,6 +89,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     }
 
                     foreach ($request->response as $key => $response) {
+                        if (!property_exists($response, 'code')) {
+                            $response->code = 200;
+                        }
+
                         if ($response->code >=100 && $response->code <200) {
                             $response->class = 'info';
                         } elseif ($response->code >=200 && $response->code <300) {
@@ -154,6 +158,11 @@ protected function getTwig()
         });
 
         $twig->addFunction($f);
+
+        $twig->addFunction(new \Twig_SimpleFunction("upper", function ($data) {
+            return strtoupper($data);
+        }));
+
         return $twig;
     }
 
diff --git a/templates/request.html b/templates/request.html
index d3660b8..2800945 100644
--- a/templates/request.html
+++ b/templates/request.html
@@ -60,7 +60,7 @@ <h1> {{request.name}} </h1>
                             <th>Example Value</th>
                         </tr>
                         </thead>
-                        {% for parameter in request.request.body.formdata %}
+                        {% for parameter in request.request.response.body.formdata %}
                         <tr>
                             <td>{{parameter.key}}</td>
                             <td>{{parameter.type}}</td>
@@ -90,6 +90,48 @@ <h2>Example responses</h2>
             {% for response in request.response %}
             <div class="panel panel-{{response.class}}">
                 <div class="panel-heading">{{response.name}}</div>
+                <div class="panel ">
+                    <div class="panel-heading">
+                        <strong>{{upper(response.originalRequest.method)}}</strong> {{response.originalRequest.url.raw}}
+                    </div>
+                </div>
+                {% if response.originalRequest.method != 'GET' %}
+                {% if response.originalRequest.body.mode == 'formdata' %}
+                <div class="panel panel-default">
+                    <div class="panel-heading">Form-data Parameters </div>
+                    <div class="panel-body">
+                        <table class="table table-hover ">
+                            <thead>
+                            <tr>
+                                <th>Key</th>
+                                <th>Type</th>
+                                <th>Example Value</th>
+                            </tr>
+                            </thead>
+                            {% for parameter in response.originalRequest.body.formdata %}
+                            <tr>
+                                <td>{{parameter.key}}</td>
+                                <td>{{parameter.type}}</td>
+                                {% if parameter.type == 'file' %}
+                                <td>{{parameter.src}}</td>
+                                {% else %}
+                                <td>{{parameter.value}}</td>
+                                {% endif %}
+                            </tr>
+                            {% endfor %}
+                        </table>
+                    </div>
+                </div>
+                {% endif %}
+                {% if response.originalRequest.body.mode == 'raw' %}
+                <div class="panel panel-default">
+                    <div class="panel-heading">JSON</div>
+                    <div class="panel-body">
+                        <pre><code>{{prettify(response.originalRequest.body.raw)}}</code></pre>
+                    </div>
+                </div>
+                {% endif %}
+                {% endif %}
                 <div class="panel-body">
 
                     <pre><code>{{response.code}} {{response.status}}</code></pre>