diff --git a/senpy/static/js/main.js b/senpy/static/js/main.js
index b6933ed..2499149 100644
--- a/senpy/static/js/main.js
+++ b/senpy/static/js/main.js
@@ -316,13 +316,27 @@ function get_datasets_from_checkbox(){
 }
 
 
+function create_body_metrics(evaluations){
+	var new_tbody = document.createElement('tbody')
+	var metric_html = ""
+    for (var eval in evaluations){
+        metric_html += "<tr><th>"+evaluations[eval].evaluates+"</th><th>"+evaluations[eval].evaluatesOn+"</th>";
+        for (var metric in evaluations[eval].metrics){
+            metric_html +=  "<th>"+parseFloat(evaluations[eval].metrics[metric].value.toFixed(4))+"</th>";
+        }
+        metric_html += "</tr>";
+    }
+    new_tbody.innerHTML = metric_html
+    return new_tbody
+}
+
 function evaluate_JSON(){
 
     url = "/api/evaluate";
 
     var container = document.getElementById('results_eval');
     var rawcontainer = document.getElementById('jsonraw_eval');
-    var table = document.getElementById("evaluation-table");
+    var table = document.getElementById("eval_table");
 
     rawcontainer.innerHTML = "";
     container.innerHTML = "";
@@ -345,25 +359,18 @@ function evaluate_JSON(){
             mode: 'view'
         };
 
-        var metric_html = "<table class=\"table table-condensed\">";
-        metric_html += "<tr><th>Plugin</th><th>Dataset</th><th>Accuracy</th><th>Precision_macro</th><th>Recall_macro</th><th>F1_macro</th><th>F1_weighted</th><th>F1_micro</th><th>F1</th></tr>";
-
+        //Control the single response results
         if (!(Array.isArray(response.evaluations))){
             response.evaluations = [response.evaluations]
         }
-        for (var eval in response.evaluations){
-            metric_html += "<tr><th>"+response.evaluations[eval].evaluates+"</th><th>"+response.evaluations[eval].evaluatesOn+"</th>";
-            for (var metric in response.evaluations[eval].metrics){
-                metric_html +=  "<th>"+parseFloat(response.evaluations[eval].metrics[metric].value.toFixed(4))+"</th>";
-            }
-            metric_html += "</tr>";
-        }
-        table.innerHTML = metric_html;
+
+        new_tbody = create_body_metrics(response.evaluations)
+        table.replaceChild(new_tbody, table.lastElementChild)
 
         var editor = new JSONEditor(container, options, response);
         editor.expandAll();
         // $('#results-div a[href="#viewer"]').tab('show');
-        $('#evaluate-div a[href="#evaluate-viewer"]').click();
+        $('#evaluate-div a[href="#evaluate-table"]').click();
         // location.hash = 'raw';
         
         
diff --git a/senpy/templates/index.html b/senpy/templates/index.html
index bae9e91..5d7e4f4 100755
--- a/senpy/templates/index.html
+++ b/senpy/templates/index.html
@@ -178,7 +178,7 @@ I cannot believe it!</textarea>
               <ul class="nav nav-tabs" role="tablist">
                 <li role="presentation" class="active"><a data-toggle="tab" class="active" href="#evaluate-viewer">Viewer</a></li>
                 <li role="presentation"><a data-toggle="tab" class="active" href="#evaluate-raw">Raw</a></li>
-                <li role="presentation"><a class="active" href="#evaluate-table">Table</a></li>
+                <li role="presentation"><a data-toggle="tab" class="active" href="#evaluate-table">Table</a></li>
               </ul>
               <div class="tab-content" id="evaluate-container">
                 
@@ -194,10 +194,27 @@ I cannot believe it!</textarea>
                   </div>
                 </div>
                 <div class="tab-pane"  id="evaluate-table">
-                  <div id="evaluation-table" class="evaluation-table">
+                    <table id="eval_table" class="table table-condensed">
+                      <thead>
+                        <tr>
+                        <th>Plugin</th>
+                        <th>Dataset</th>
+                        <th>Accuracy</th>
+                        <th>Precision_macro</th>
+                        <th>Recall_macro</th>
+                        <th>F1_macro</th>
+                        <th>F1_weighted</th>
+                        <th>F1_micro</th>
+                        <th>F1</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                      </tbody>
+                    </table>
                   </div>
                 </div>
-              
+                </div>
+              </div>
             </div>
         </div>