diff --git a/module/story/css/report.ui.css b/module/story/css/report.ui.css
new file mode 100644
index 0000000000..f74b636c44
--- /dev/null
+++ b/module/story/css/report.ui.css
@@ -0,0 +1,6 @@
+.sidebar .panel {padding: 0px 0px; margin-bottom: 0px;}
+.sidebar .panel .panel-heading {padding-bottom: 0px;}
+.sidebar .panel .panel-heading .panel-title {font-size: 14px;}
+.sidebar .panel .panel-body li {margin-bottom: 6px;}
+.sidebar .panel .toolbar {flex: none;}
+.sidebar .panel .toolbar .btn {min-width: auto;}
diff --git a/module/story/js/report.ui.js b/module/story/js/report.ui.js
index be3cc0d4b4..69cf8d8e7b 100644
--- a/module/story/js/report.ui.js
+++ b/module/story/js/report.ui.js
@@ -24,6 +24,10 @@ window.reportSubmit = function(btnEle)
     }
 
     $submitBtn.prop('disabled', true);
+    setTimeout(function()
+    {
+        $submitBtn.prop('disabled', false);
+    }, 3000);
 
     postAndLoadPage($(form).prop('action'), formData, ["#mainPanel"]);
 };
diff --git a/module/story/ui/report.html.php b/module/story/ui/report.html.php
index ea3c91390e..7622eb2e69 100644
--- a/module/story/ui/report.html.php
+++ b/module/story/ui/report.html.php
@@ -38,7 +38,13 @@ $fnGenerateTabCharts = function(string $type) use($charts, $lang, $datas)
         (
             set::type($type),
             set::title($lang->story->report->charts[$chartType]),
-            set::datas($datas[$chartType])
+            set::datas($datas[$chartType]),
+            set::tableHeaders(array
+            (
+                'item'    => $lang->story->report->$chartType->item,
+                'value'   => $lang->story->report->value,
+                'percent' => $lang->report->percent
+            ))
         );
     }
 
@@ -70,11 +76,14 @@ $fnGenerateTabs = function() use($fnGenerateTabCharts, $lang, $chartType)
 /* Layout. */
 featureBar
 (
-    backBtn
-    (
-        set::icon('back'),
-        set::type('secondary'),
-        $lang->goback
+    to::before(
+        backBtn
+        (
+            set::icon('back'),
+            set::type('secondary'),
+            $lang->goback
+        ),
+        div(setClass('nav-divider'))
     ),
     div
     (
@@ -90,6 +99,7 @@ sidebar
     formPanel
     (
         set::title($lang->story->report->select),
+        setClass('shadow'),
         set::actions(array
         (
             array('text'=> $lang->selectAll,             'onclick' => 'window.reportSelectAllFields(this)', 'type' => 'button', 'class' => ''),
@@ -107,5 +117,3 @@ panel(
         $fnGenerateTabs()
     )
 );
-
-render();