diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 4533260f94..86672bb332 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -64,7 +64,7 @@
             <div class='col-md-6'>
               <div class='panel panel-sm contentDiv'>
                 <div class='panel-heading'><?php echo html::icon($lang->icons['story']) . ' ' . $lang->build->linkStories;?></div>
-                <table class='table table table-borderless table-condensed table-hover'>
+                <table class='table table table-borderless table-condensed table-hover table-fixed'>
                   <thead>
                     <tr class='text-center'>
                       <th class='w-id text-left'><?php echo html::selectAll('story', 'checkbox') . ' ' . $lang->idAB;?></th>
@@ -88,7 +88,7 @@
             <div class='col-md-6'>
               <div class='panel panel-sm contentDiv'>
                 <div class='panel-heading'><?php echo html::icon($lang->icons['bug']) . ' ' . $lang->build->linkBugs;?></div>
-                <table class='table table table-borderless table-condensed table-hover'>
+                <table class='table table table-borderless table-condensed table-hover table-fixed'>
                   <thead>
                     <tr class='text-center'>
                       <th class='w-id text-left'><?php echo html::selectAll('bug', 'checkbox') . ' ' . $lang->idAB;?></th>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index 28eec4e0ac..80cc2020ec 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -69,7 +69,7 @@
           <div class='tab-pane' id='testScope'>
             <?php $countStories = count($stories); $countBugs = count($bugs); ?>
             <table class='table table-hover table-condensed tablesorter mgb-20'>
-              <caption class='text-left'><i class='icon-lightbulb'></i> <strong><?php echo $lang->testtask->stories;?></strong> <span class='text-muted'><?php echo sprintf($lang->build->finishStories, $countStories);?></span></caption>
+              <caption class='text-left'><i class='icon-lightbulb'></i> <strong><?php echo $lang->testtask->stories;?></strong> <span class='text-muted'>(<?php echo $countStories?>)</span></caption>
               <?php if($countStories > 0):?>
               <thead>
                 <tr>
@@ -97,7 +97,7 @@
               <?php endif;?>
             </table>
             <table class='table table-hover table-condensed tablesorter'>
-            <caption class='text-left'><i class='icon-bug'></i><strong><?php echo $lang->testtask->bugs;?></strong> <span class='text-muted'><?php echo sprintf($lang->build->resolvedBugs, $countBugs)?></span></caption>
+            <caption class='text-left'><i class='icon-bug'></i><strong><?php echo $lang->testtask->bugs;?></strong> <span class='text-muted'><?php echo $countBugs?></span></caption>
                 <thead>
                 <tr>
                   <th class='w-id'><?php echo $lang->idAB;?></th>
diff --git a/module/upgrade/view/confirm.html.php b/module/upgrade/view/confirm.html.php
index aec3d427c7..930a23c7b3 100644
--- a/module/upgrade/view/confirm.html.php
+++ b/module/upgrade/view/confirm.html.php
@@ -17,7 +17,7 @@
         <strong><?php echo $lang->upgrade->confirm;?></strong>
       </div>
       <div class='modal-body'>
-        <textarea rows='20' class='form-control'><?php echo $confirm;?></textarea>
+        <textarea rows='20' class='form-control' readonly='readonly'><?php echo $confirm;?></textarea>
       </div>
       <div class='modal-footer'><?php echo html::submitButton($lang->upgrade->sureExecute) . html::hidden('fromVersion', $fromVersion);?></div>
     </div>
diff --git a/module/upgrade/view/index.html.php b/module/upgrade/view/index.html.php
index a93f32311c..7324f6f969 100644
--- a/module/upgrade/view/index.html.php
+++ b/module/upgrade/view/index.html.php
@@ -16,12 +16,12 @@
       <strong><?php echo $lang->upgrade->warnning;?></strong>
     </div>
     <div class='modal-body'>
-      <div class='alert alert-warning'>
+      <div class='alert alert-warning with-icon'>
         <i class='icon-info-sign'></i>
         <div class='content'><?php echo $lang->upgrade->warnningContent;?></div>
       </div>
     </div>
-    <div class='modal-footer'><?php echo html::linkButton($lang->upgrade->common, inlink('selectVersion'));?></div>
+    <div class='modal-footer'><?php echo html::linkButton($lang->upgrade->common, inlink('selectVersion'), 'self', '', 'btn-primary');?></div>
   </div>
 </div>
 <?php include '../../common/view/footer.lite.html.php';?>
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 08bee44445..44c0b21c95 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -1067,10 +1067,10 @@ function setModal()
         if(setting.afterHidden && $.isFunction(setting.afterHidden)) $ajaxModal.on('hidden.bs.modal', setting.afterHidden);
     }
 
-    function ajustModalPosition(position)
+    function ajustModalPosition(position, dialog)
     {
         position = position || 'fit';
-        var dialog = $('#ajaxModal .modal-dialog');
+        if(!dialog) dialog = $('#ajaxModal .modal-dialog');
         if(position)
         {
            var half = Math.max(0, ($(window).height() - dialog.outerHeight())/2);
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 7d2b056cb8..e521e11991 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -97,7 +97,7 @@ hr.small {margin: 10px 0}
 .table tr.active td, .table-hover>tbody>tr.active:hover>td, .table-hover>tbody>tr.active:hover>th, .table-striped>tbody>tr.active:nth-child(odd).active>td, .table-striped>tbody>tr.active:nth-child(odd)>th {background-color: #FCE6A2}
 .table tr>td.active, .table tr>th.active, .table tr.active>td, .table tr.active>th {background-color: #FCE6A2}
 
-.table caption {padding: 8px 20px; border-bottom: 1px solid #ddd; background: #fafafa;}
+.table caption {padding: 8px 20px; border: 1px solid #DDD; border-bottom: 0; background: #fafafa;}
 .table.table-condensed caption {padding: 6px 15px;}
 
 /* Datepicker */