diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php
index a29f40b511..9ba98e7cac 100644
--- a/module/block/view/bugblock.html.php
+++ b/module/block/view/bugblock.html.php
@@ -23,7 +23,7 @@
 .block-bugs.block-sm .c-status .label-dot {display: none;}
 .block-bugs.block-sm .c-status {text-align: center;}
 </style>
-<div class='panel-body has-table'>
+<div class='panel-body has-table scrollbar-hover'>
   <table class='table table-borderless table-fixed-head table-hover tablesorter block-bugs <?php if(!$longBlock) echo 'block-sm'?>'>
     <thead>
       <tr>
diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php
index a1b22f7e21..26261ab722 100644
--- a/module/block/view/buildblock.html.php
+++ b/module/block/view/buildblock.html.php
@@ -13,7 +13,7 @@
 <?php if(empty($builds)): ?>
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
-<div class='panel-body has-table'>
+<div class='panel-body has-table scrollbar-hover'>
   <table class='table table-borderless table-hover table-fixed-head tablesorter block-builds'>
     <thead>
       <tr>
diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php
index 14ba5775c0..5ec526c4a9 100644
--- a/module/block/view/caseblock.html.php
+++ b/module/block/view/caseblock.html.php
@@ -14,7 +14,7 @@
 <?php if(empty($cases)): ?>
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
-<div class='panel-body has-table'>
+<div class='panel-body has-table scrollbar-hover'>
   <style>
   .block-cases.block-sm .c-status{text-align:center}
   .block-cases.block-sm .c-status .status-text{display:none;}
diff --git a/module/block/view/flowchart.html.php b/module/block/view/flowchart.html.php
index 176c3e1fa6..f955df70bb 100644
--- a/module/block/view/flowchart.html.php
+++ b/module/block/view/flowchart.html.php
@@ -20,7 +20,7 @@
 .block-flowchart .flowchart-title {font-size: 14px;font-weight: bold;color: #3c4353;}
 .block-flowchart .flowchart-step {display: inline-block;width: 24px;height: 24px;font-size: 14px;line-height: 24px;color: #fff; border-radius: 50%;}
 </style>
-<div class='panel-body has-table'>
+<div class='panel-body has-table scrollbar-hover'>
   <table class="table table-borderless">
     <thead>
       <tr>
diff --git a/module/block/view/planblock.html.php b/module/block/view/planblock.html.php
index b27e072227..af0ce9bb65 100644
--- a/module/block/view/planblock.html.php
+++ b/module/block/view/planblock.html.php
@@ -13,7 +13,7 @@
 <?php if(empty($plans)): ?>
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
-<div class='panel-body has-table'>
+<div class='panel-body has-table scrollbar-hover'>
   <table class='table table-borderless table-hover table-fixed-head tablesorter block-plan'>
     <thead>
     <tr>
diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php
index 15cfdfd150..f6a03e92fd 100644
--- a/module/block/view/productblock.html.php
+++ b/module/block/view/productblock.html.php
@@ -16,7 +16,7 @@
 <style>
 .block-products.block-sm .c-project {display: none;}
 </style>
-<div class="panel-body has-table block-products">
+<div class="panel-body has-table scrollbar-hover block-products">
   <table class='table table-borderless table-hover table-fixed-head tablesorter table-fixed'>
     <thead>
       <tr>
diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php
index 98be6a8fc2..81f5dc327c 100644
--- a/module/block/view/productstatisticblock.html.php
+++ b/module/block/view/productstatisticblock.html.php
@@ -34,7 +34,7 @@
 .block-statistic .tile {margin-bottom: 30px;}
 .block-statistic .tile-title {font-size: 18px; color: #A6AAB8;}
 .block-statistic .tile-amount {font-size: 48px; margin-bottom: 10px;}
-.block-statistic .col-nav {border-left: 1px solid #EBF2FB; width: 260px; padding-left: 0;}
+.block-statistic .col-nav {border-left: 1px solid #EBF2FB; width: 260px; padding: 0;}
 .block-statistic .nav-secondary > li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
 .block-statistic .nav-secondary > li.active > a {color: #3C4353; background: transparent; box-shadow: none;}
 .block-statistic .nav-secondary > li.active > a:hover,
@@ -162,7 +162,7 @@
       <?php endforeach;?>
     </div>
     <div class="col col-nav">
-      <ul class="nav nav-stacked nav-secondary">
+      <ul class="nav nav-stacked nav-secondary scrollbar-hover">
         <?php foreach($products as $product):?>
         <li <?php if($product == reset($products)) echo "class='active'";?>><a href="javascript:;" data-target="#tab<?php echo $product->code;?>" data-toggle="tab" title='<?php echo $product->name;?>'><?php echo $product->name;?></a></li>
         <?php endforeach;?>
diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php
index f8901654f8..4bde5cbc78 100644
--- a/module/block/view/projectblock.html.php
+++ b/module/block/view/projectblock.html.php
@@ -13,7 +13,7 @@
 <?php if(empty($projectStats)): ?>
 <div class='empty-tip'><?php common::printLink('project', 'create', '', "<i class='icon-plus'></i> " . $lang->project->create, '', "class='btn btn-primary'")?></div>
 <?php else:?>
-<div class="panel-body has-table">
+<div class="panel-body has-table scrollbar-hover">
   <table class='table table-borderless table-hover table-fixed-head tablesorter block-projects tablesorter'>
     <thead>
       <tr class='text-center'>
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index 95d83b8a37..ba65064721 100644
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -21,7 +21,7 @@
 .block-statistic .tile {margin-bottom: 30px;}
 .block-statistic .tile-title {font-size: 18px; color: #A6AAB8;}
 .block-statistic .tile-amount {font-size: 48px; margin-bottom: 10px;}
-.block-statistic .col-nav {border-left: 1px solid #EBF2FB; width: 260px; padding-left: 0;}
+.block-statistic .col-nav {border-left: 1px solid #EBF2FB; width: 260px; padding: 0;}
 .block-statistic .nav-secondary > li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
 .block-statistic .nav-secondary > li.active > a {color: #3C4353; background: transparent; box-shadow: none;}
 .block-statistic .nav-secondary > li.active > a:hover,
@@ -116,7 +116,7 @@
       <?php endforeach;?>
     </div>
     <div class="col col-nav">
-      <ul class="nav nav-stacked nav-secondary">
+      <ul class="nav nav-stacked nav-secondary scrollbar-hover">
         <?php foreach($projects as $project):?>
         <li <?php if($project == reset($projects)) echo "class='active'";?>><a href="###" data-target="#tab3Content<?php echo $project->id;?>" data-toggle="tab"><?php echo $project->name;?></a></li>
         <?php endforeach;?>
diff --git a/module/block/view/qastatisticblock.html.php b/module/block/view/qastatisticblock.html.php
index 553ad3d0e4..0670db1928 100644
--- a/module/block/view/qastatisticblock.html.php
+++ b/module/block/view/qastatisticblock.html.php
@@ -17,11 +17,12 @@
 .product-info .type-value {font-size: 14px;}
 .product-info .type-value > strong {font-size: 20px; color: #3C4353;}
 .product-info .actions {position: absolute; left: 10px; top: 14px;}
+.block-statistic .panel-body {padding-top: 0;}
 .block-statistic .tile {margin-bottom: 30px;}
 .block-statistic .tile-title {font-size: 18px; color: #A6AAB8;}
 .block-statistic .tile-amount {font-size: 48px; margin-bottom: 10px;}
-.block-statistic .col-nav {border-left: 1px solid #EBF2FB; width: 260px; padding-left: 0;}
-.block-statistic .nav-secondary > li > a {font-size: 16px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
+.block-statistic .col-nav {border-left: 1px solid #EBF2FB; width: 260px; padding: 0;}
+.block-statistic .nav-secondary > li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
 .block-statistic .nav-secondary > li.active > a {color: #3C4353; background: transparent; box-shadow: none;}
 .block-statistic .nav-secondary > li.active > a:hover,
 .block-statistic .nav-secondary > li.active > a:focus,
diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php
index 9db4c9ccbf..ed8f608b55 100644
--- a/module/block/view/releaseblock.html.php
+++ b/module/block/view/releaseblock.html.php
@@ -13,7 +13,7 @@
 <?php if(empty($releases)): ?>
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
-<div class='panel-body has-table'>
+<div class='panel-body has-table scrollbar-hover'>
   <table class='table table-borderless table-hover table-fixed tablesorter block-release'>
     <thead>
       <tr>
diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php
index 12f8307528..8dfd9dd520 100644
--- a/module/block/view/storyblock.html.php
+++ b/module/block/view/storyblock.html.php
@@ -24,7 +24,7 @@
 .block-stories.block-sm .c-status .label-dot {display: none;}
 .block-stories.block-sm .c-status {text-align: center;}
 </style>
-<div class='panel-body has-table'>
+<div class='panel-body has-table scrollbar-hover'>
   <table class='table table-borderless table-hover table-fixed-head tablesorter block-stories <?php if(!$longBlock) echo 'block-sm'?>'>
     <thead>
       <tr>
diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php
index 081f1c8de8..cf3291ebf8 100644
--- a/module/block/view/taskblock.html.php
+++ b/module/block/view/taskblock.html.php
@@ -24,7 +24,7 @@
 .block-tasks.block-sm .c-status .label-dot {display: none;}
 .block-tasks.block-sm .c-status {text-align: center;}
 </style>
-<div class='panel-body has-table'>
+<div class='panel-body has-table scrollbar-hover'>
   <table class='table table-borderless table-hover table-fixed-head tablesorter block-tasks <?php if(!$longBlock) echo 'block-sm';?>'>
     <thead>
       <tr>
diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php
index a0b9a8d5e1..cc248029df 100644
--- a/module/block/view/testtaskblock.html.php
+++ b/module/block/view/testtaskblock.html.php
@@ -13,7 +13,7 @@
 <?php if(empty($testtasks)): ?>
 <div class='empty-tip'><?php echo $lang->block->emptyTip;?></div>
 <?php else:?>
-<div class='panel-body has-table'>
+<div class='panel-body has-table scrollbar-hover'>
   <table class='table table-borderless table-hover table-fixed-head tablesorter block-testtask'>
     <thead>
       <tr class='text-center'>
diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php
index 7cba33bf1b..3dd4f351c5 100644
--- a/module/block/view/todoblock.html.php
+++ b/module/block/view/todoblock.html.php
@@ -26,7 +26,7 @@
 .block-todoes .todo-check {position: absolute; top: 5px; left: 10px; display: block; width: 20px; height: 20px; font-size: 20px; color: transparent; cursor: pointer; background: #fff; border: 2px solid #eee; border-radius: 50%;}
 .block-todoes .todo-check:hover {border-color: #8e939a;}
 .block-todoes .active > .todo-check {color: #00da88; background: transparent;border: none;}
-.block-todoes .todoes-form {position: absolute; top: -45px; right: 0; left: 0; z-index: 15; max-width: 500px; padding: 12px 20px 20px; visibility: hidden; background: #fff; -webkit-box-shadow: 0 0 20px 0 #bdc9d8; box-shadow: 0 0 20px 0 #bdc9d8; opacity: 0;-webkit-transition: .4s cubic-bezier(.175, .885, .32, 1); -o-transition: .4s cubic-bezier(.175, .885, .32, 1); transition: .4s cubic-bezier(.175, .885, .32, 1); -webkit-transition-property: opacity, visibility; -o-transition-property: opacity, visibility; transition-property: opacity, visibility;}
+.block-todoes .todoes-form {position: absolute; top: -45px; right: 0; left: 0; z-index: 1011; max-width: 500px; padding: 12px 20px 20px; visibility: hidden; background: #fff; -webkit-box-shadow: 0 0 20px 0 #bdc9d8; box-shadow: 0 0 20px 0 #bdc9d8; opacity: 0;-webkit-transition: .4s cubic-bezier(.175, .885, .32, 1); -o-transition: .4s cubic-bezier(.175, .885, .32, 1); transition: .4s cubic-bezier(.175, .885, .32, 1); -webkit-transition-property: opacity, visibility; -o-transition-property: opacity, visibility; transition-property: opacity, visibility;}
 .block-todoes .todoes-form .form-group > label {padding-left: 0;}
 .block-todoes .todoes-form .form-group > label.text-center {text-align: center!important;}
 .block-todoes .todoes-form > .form-group:last-child {margin-bottom: 0;}