diff --git a/benchmark/scripts/app/templates/datasets.html b/benchmark/scripts/app/templates/datasets.html
index 207bde3..c11c1ae 100644
--- a/benchmark/scripts/app/templates/datasets.html
+++ b/benchmark/scripts/app/templates/datasets.html
@@ -1,28 +1,44 @@
-{% extends "base_" ~ framework ~ ".html" %}
-{% if framework == "bootstrap" %}
-  {% set close_button = '<button type="button" class="btn-close btn-small" aria-label="Close" onclick="location.href = \'/index/' ~ compare ~ '\'"></button>' %}
-  {% set button_class = "btn btn-primary btn-small" %}
-  {% set h1_class = "text-center" %}
-  {% set table_class = "table table-striped table-hover table-bordered" %}
-  {% set head_class = "bg-primary text-white" %}
-  {% set text_right = "text-end" %}
-  {% set container = "container" %}
-  {% set selected = "selected" %}
+{% extends 'base_' ~ framework ~ '.html' %}
+{% if framework == 'bootstrap' %}
+  {% set button_class = 'btn btn-primary btn-small' %}
+  {% set h1_class = 'text-center' %}
+  {% set table_class = 'table table-striped table-hover table-bordered' %}
+  {% set head_class = 'bg-primary text-white' %}
+  {% set text_right = 'text-end' %}
+  {% set container = 'container' %}
+  {% set selected = 'selected' %}
+  {%- macro header(title, close, url) -%}
+    <div class="p-4 bg-primary text-white">
+      {%- if close -%}
+        <button type="button" class="btn-close" aria-label="Close" onclick="location.href = '{{ url }}'"></button>
+      {%- endif -%}
+      <h1 class="alternate-font">{{ title }}</h1>
+    </div>
+  {%- endmacro -%}
 {% else %}
-  {% set close_button = '<button class="delete is-large" onclick="location.href = \'/index/' ~ compare ~ '\'"></button>' %}
-  {% set button_class = "button is-primary is-small" %}
-  {% set h1_class = "title is-1 has-text-centered" %}
-  {% set table_class = "table is-striped is-hoverable cell-border is-bordered" %}
-  {% set head_class = "is-selected" %}
-  {% set text_right = "has-text-right" %}
-  {% set container = "container" %}
-  {% set selected = "is-selected" %}
+  {% set button_class = 'button is-primary is-small' %}
+  {% set h1_class = 'title is-1 has-text-centered' %}
+  {% set table_class = 'table is-striped is-hoverable cell-border is-bordered' %}
+  {% set head_class = 'is-selected' %}
+  {% set text_right = 'has-text-right' %}
+  {% set container = 'container' %}
+  {% set selected = 'is-selected' %}
+  {%- macro header(title, close, url) -%}
+    <div class="hero is-info is-bold">
+      <div class="hero-body">
+        {%- if close -%}
+          <button class="delete is-large" onclick="location.href = '{{ url }}'"></button>
+        {%- endif -%}
+        <h1 class="is-size-3 alternate-font">{{ title }}</h1>
+      </div>
+    </div>
+  {%- endmacro -%}
 {% endif %}
 {% block content %}
   <div class="{{ container }}">
-    <h1 class="{{ h1_class }}">{{ close_button|safe }} Benchmark Datasets Report</h1>
+    {{ header('Benchmark Datasets Report', True, url_for('main.index', compare = compare)) }}
     <button class="{{ button_class }}" onclick="excelFiles(['datasets'], false)"><i class="mdi mdi-file-excel"></i> Excel</button>
-    {% include "partials/datasets_table.html" %}
+    {% include 'partials/datasets_table.html' %}
   </div>
 {% endblock %}
 {% block jscript %}
@@ -46,4 +62,4 @@
       }
     });
   </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/benchmark/scripts/app/templates/partials/select.js b/benchmark/scripts/app/templates/partials/select.js
index 4baf072..d20a897 100644
--- a/benchmark/scripts/app/templates/partials/select.js
+++ b/benchmark/scripts/app/templates/partials/select.js
@@ -16,6 +16,9 @@ $(document).ready(function () {
     //    "lengthMenu": "_MENU_"
     //}
   });
+  $('#file-table').on( 'draw.dt', function () {
+    enable_disable_best_buttons();
+  } );
   // Check if row is selected
   $("#file-table tbody").on("click", "tr", function () {
     if ($(this).hasClass("{{ select.selected() }}")) {
@@ -38,22 +41,19 @@ $(document).ready(function () {
     $("body").removeClass("ajaxLoading");
   });
   $('#compare').change(function() {
-    if ($(this).is(':checked')) {
-      $("[name='best_buttons']").removeAttr("hidden");
-      $("[name='best_buttons']").addClass("tag is-link is-normal");
-    } else {
-      $("[name='best_buttons']").attr("hidden", true);
-      $("[name='best_buttons']").removeClass("tag is-link is-normal");
-    }
+    enable_disable_best_buttons();
   });
-  if ($('#compare').is(':checked')) {
-      $("[name='best_buttons']").removeAttr("hidden");
-      $("[name='best_buttons']").addClass("tag is-link is-normal");
-    } else {
-      $("[name='best_buttons']").attr("hidden", true);
-      $("[name='best_buttons']").removeClass("tag is-link is-normal");
-    }
+  enable_disable_best_buttons();
 });
+function enable_disable_best_buttons(){
+  if ($('#compare').is(':checked')) {
+    $("[name='best_buttons']").addClass("tag is-link is-normal");
+      $("[name='best_buttons']").removeAttr("hidden");
+    } else {
+      $("[name='best_buttons']").removeClass("tag is-link is-normal");
+      $("[name='best_buttons']").attr("hidden", true);
+    }
+}
 function showFile(selectedFile) {
   var form = $(
     '<form action="/show" method="post">' +
diff --git a/benchmark/scripts/app/templates/report_best.html b/benchmark/scripts/app/templates/report_best.html
index bada157..442a74b 100644
--- a/benchmark/scripts/app/templates/report_best.html
+++ b/benchmark/scripts/app/templates/report_best.html
@@ -2,8 +2,8 @@
 {% extends "base_" ~ framework ~ ".html" %}
 {% import "partials/cfg_select_" ~ framework ~ ".jinja" as select %}
 {% block content %}
-    {{ select.header(title, True, url_for("main.index", compare=compare)) }}
-    <container class="{{select.get_container_class() }}">
+    <div class="container">
+        {{ select.header(title, True, url_for("main.index", compare=compare)) }}
         <table id="file-table" class="{{ select.get_table_class() }}">
             <thead>
                 <tr class="{{ select.get_row_head_class() }}">
@@ -27,7 +27,7 @@
                 {% endfor %}
             </tbody>
         </table>
-    </container>
+    </div>
 {% endblock %}
 {% block jscript %}
 <script>