diff --git a/module/action/lang/de.php b/module/action/lang/de.php
index dd04ece590..e979911ba9 100644
--- a/module/action/lang/de.php
+++ b/module/action/lang/de.php
@@ -240,10 +240,10 @@ $lang->action->desc->linkrelatedcase   = '$date, <strong>$actor</strong> hat ein
 $lang->action->desc->unlinkrelatedcase = '$date, <strong>$actor</strong> hate eine Fallverknüpfung aufgelöst <strong>$extra</strong>.' . "\n";
 
 /* Used to describe the history of operations link story and bug to productplan. */
-$lang->action->desc->linkstory   = '$date, 由 <strong>$actor</strong> 关联需求 <strong>$extra</strong> 到计划。' . "\n";
-$lang->action->desc->linkbug     = '$date, 由 <strong>$actor</strong> 关联BUG <strong>$extra</strong> 到计划。' . "\n";
-$lang->action->desc->unlinkstory = '$date, 由 <strong>$actor</strong> 从计划移除需求 <strong>$extra</strong>。' . "\n";
-$lang->action->desc->unlinkbug   = '$date, 由 <strong>$actor</strong> 从计划移除BUG <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkstory   = '$date, <strong>$actor</strong> link stories <strong>$extra</strong> to plan.' . "\n";
+$lang->action->desc->linkbug     = '$date, <strong>$actor</strong> link bugs <strong>$extra</strong> to plan.' . "\n";
+$lang->action->desc->unlinkstory = '$date, <strong>$actor</strong> remove stories <strong>$extra</strong> from plan.' . "\n";
+$lang->action->desc->unlinkbug   = '$date, <strong>$actor</strong> remove bugs <strong>$extra</strong> from plan.' . "\n";
 
 /* Used to display dynamic information. */
 $lang->action->label                        = new stdclass();
diff --git a/module/action/lang/en.php b/module/action/lang/en.php
index 1a927d1e7e..cb2d41453a 100755
--- a/module/action/lang/en.php
+++ b/module/action/lang/en.php
@@ -240,10 +240,10 @@ $lang->action->desc->linkrelatedcase   = '$date, <strong>$actor</strong> linked
 $lang->action->desc->unlinkrelatedcase = '$date, <strong>$actor</strong> unlinked a case <strong>$extra</strong>.' . "\n";
 
 /* Used to describe the history of operations link story and bug to productplan. */
-$lang->action->desc->linkstory   = '$date, 由 <strong>$actor</strong> 关联需求 <strong>$extra</strong> 到计划。' . "\n";
-$lang->action->desc->linkbug     = '$date, 由 <strong>$actor</strong> 关联BUG <strong>$extra</strong> 到计划。' . "\n";
-$lang->action->desc->unlinkstory = '$date, 由 <strong>$actor</strong> 从计划移除需求 <strong>$extra</strong>。' . "\n";
-$lang->action->desc->unlinkbug   = '$date, 由 <strong>$actor</strong> 从计划移除BUG <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkstory   = '$date, <strong>$actor</strong> link stories <strong>$extra</strong> to plan.' . "\n";
+$lang->action->desc->linkbug     = '$date, <strong>$actor</strong> link bugs <strong>$extra</strong> to plan.' . "\n";
+$lang->action->desc->unlinkstory = '$date, <strong>$actor</strong> remove stories <strong>$extra</strong> from plan.' . "\n";
+$lang->action->desc->unlinkbug   = '$date, <strong>$actor</strong> remove bugs <strong>$extra</strong> from plan.' . "\n";
 
 /* Used to display dynamic information. */
 $lang->action->label                        = new stdclass();
diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php
index 534a5cbe99..d6e3830032 100644
--- a/module/action/lang/fr.php
+++ b/module/action/lang/fr.php
@@ -240,10 +240,10 @@ $lang->action->desc->linkrelatedcase   = '$date, <strong>$actor</strong> a fait
 $lang->action->desc->unlinkrelatedcase = '$date, <strong>$actor</strong> a délié le CasTest <strong>$extra</strong>.' . "\n";
 
 /* Used to describe the history of operations link story and bug to productplan. */
-$lang->action->desc->linkstory   = '$date, 由 <strong>$actor</strong> 关联需求 <strong>$extra</strong> 到计划。' . "\n";
-$lang->action->desc->linkbug     = '$date, 由 <strong>$actor</strong> 关联BUG <strong>$extra</strong> 到计划。' . "\n";
-$lang->action->desc->unlinkstory = '$date, 由 <strong>$actor</strong> 从计划移除需求 <strong>$extra</strong>。' . "\n";
-$lang->action->desc->unlinkbug   = '$date, 由 <strong>$actor</strong> 从计划移除BUG <strong>$extra</strong>。' . "\n";
+$lang->action->desc->linkstory   = '$date, <strong>$actor</strong> link stories <strong>$extra</strong> to plan.' . "\n";
+$lang->action->desc->linkbug     = '$date, <strong>$actor</strong> link bugs <strong>$extra</strong> to plan.' . "\n";
+$lang->action->desc->unlinkstory = '$date, <strong>$actor</strong> remove stories <strong>$extra</strong> from plan.' . "\n";
+$lang->action->desc->unlinkbug   = '$date, <strong>$actor</strong> remove bugs <strong>$extra</strong> from plan.' . "\n";
 
 /* Used to display dynamic information. */
 $lang->action->label                        = new stdclass();
diff --git a/module/execution/model.php b/module/execution/model.php
index 7ad77afc90..1cce86f1be 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -100,7 +100,7 @@ class executionModel extends model
             include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
         }
 
-        if($execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist);
+        if(isset($execution->cal) and $execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist);
 
         if($execution and $execution->lifetime == 'ops')
         {
diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php
index ba65456908..631d83cdbb 100644
--- a/module/kanban/lang/de.php
+++ b/module/kanban/lang/de.php
@@ -216,13 +216,13 @@ $lang->kanban->error->childLimitNote    = 'The sum of products in the child colu
 $lang->kanban->error->importObjNotEmpty = 'Please select at least one import object.';
 $lang->kanban->error->childLimitEmpty   = 'Please set the WIP quantity of the sub column before operation.';
 
-$lang->kanban->orderList['id_asc']     = 'Story ID Ascending';
-$lang->kanban->orderList['id_desc']    = 'Story ID Descending';
-$lang->kanban->orderList['pri_asc']    = 'Story Priority Ascending';
-$lang->kanban->orderList['pri_desc']   = 'Story Priority Descending';
-$lang->kanban->orderList['stage_asc']  = 'Story Stage Ascending';
-$lang->kanban->orderList['stage_desc'] = 'Story Stage Descending';
-$lang->kanban->orderList['assignedTo'] = 'Assigned To';
+$lang->kanban->orderList['id_asc']          = 'Story ID Ascending';
+$lang->kanban->orderList['id_desc']         = 'Story ID Descending';
+$lang->kanban->orderList['pri_asc']         = 'Story Priority Ascending';
+$lang->kanban->orderList['pri_desc']        = 'Story Priority Descending';
+$lang->kanban->orderList['stage_asc']       = 'Story Stage Ascending';
+$lang->kanban->orderList['stage_desc']      = 'Story Stage Descending';
+$lang->kanban->orderList['assignedTo_desc'] = 'Assigned To';
 
 $lang->kanban->importList = array();
 $lang->kanban->importList['off'] = 'Import is not enabled';
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 67d89c12ee..4f06a1084e 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -216,13 +216,13 @@ $lang->kanban->error->childLimitNote    = 'The sum of products in the child colu
 $lang->kanban->error->importObjNotEmpty = 'Please select at least one import object.';
 $lang->kanban->error->childLimitEmpty   = 'Please set the WIP quantity of the sub column before operation.';
 
-$lang->kanban->orderList['id_asc']     = 'Story ID Ascending';
-$lang->kanban->orderList['id_desc']    = 'Story ID Descending';
-$lang->kanban->orderList['pri_asc']    = 'Story Priority Ascending';
-$lang->kanban->orderList['pri_desc']   = 'Story Priority Descending';
-$lang->kanban->orderList['stage_asc']  = 'Story Stage Ascending';
-$lang->kanban->orderList['stage_desc'] = 'Story Stage Descending';
-$lang->kanban->orderList['assignedTo'] = 'Assigned To';
+$lang->kanban->orderList['id_asc']          = 'Story ID Ascending';
+$lang->kanban->orderList['id_desc']         = 'Story ID Descending';
+$lang->kanban->orderList['pri_asc']         = 'Story Priority Ascending';
+$lang->kanban->orderList['pri_desc']        = 'Story Priority Descending';
+$lang->kanban->orderList['stage_asc']       = 'Story Stage Ascending';
+$lang->kanban->orderList['stage_desc']      = 'Story Stage Descending';
+$lang->kanban->orderList['assignedTo_desc'] = 'Assigned To';
 
 $lang->kanban->importList = array();
 $lang->kanban->importList['off'] = 'Import is not enabled';
diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php
index c05115c7ea..9b852ab9a9 100644
--- a/module/kanban/lang/fr.php
+++ b/module/kanban/lang/fr.php
@@ -216,13 +216,13 @@ $lang->kanban->error->childLimitNote    = 'The sum of products in the child colu
 $lang->kanban->error->importObjNotEmpty = 'Please select at least one import object.';
 $lang->kanban->error->childLimitEmpty   = 'Please set the WIP quantity of the sub column before operation.';
 
-$lang->kanban->orderList['id_asc']     = 'Story ID Ascendante';
-$lang->kanban->orderList['id_desc']    = 'Story ID Descendante';
-$lang->kanban->orderList['pri_asc']    = 'Story Priorité Ascendante';
-$lang->kanban->orderList['pri_desc']   = 'Story Priorité Descendante';
-$lang->kanban->orderList['stage_asc']  = 'Story Phase Ascendante';
-$lang->kanban->orderList['stage_desc'] = 'Story Phase Descendante';
-$lang->kanban->orderList['assignedTo'] = 'Assigné à';
+$lang->kanban->orderList['id_asc']          = 'Story ID Ascendante';
+$lang->kanban->orderList['id_desc']         = 'Story ID Descendante';
+$lang->kanban->orderList['pri_asc']         = 'Story Priorité Ascendante';
+$lang->kanban->orderList['pri_desc']        = 'Story Priorité Descendante';
+$lang->kanban->orderList['stage_asc']       = 'Story Phase Ascendante';
+$lang->kanban->orderList['stage_desc']      = 'Story Phase Descendante';
+$lang->kanban->orderList['assignedTo_desc'] = 'Assigné à';
 
 $lang->kanban->importList = array();
 $lang->kanban->importList['off'] = 'Import is not enabled';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 43630355bd..1193c97d54 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -216,13 +216,13 @@ $lang->kanban->error->childLimitNote    = '子列在制品数量之和不能大
 $lang->kanban->error->importObjNotEmpty = '请至少选择一个导入对象';
 $lang->kanban->error->childLimitEmpty   = '请先设置子列的在制品数量后再操作';
 
-$lang->kanban->orderList['id_asc']     = '需求ID正序';
-$lang->kanban->orderList['id_desc']    = '需求ID倒序';
-$lang->kanban->orderList['pri_asc']    = '需求优先级正序';
-$lang->kanban->orderList['pri_desc']   = '需求优先级倒序';
-$lang->kanban->orderList['stage_asc']  = '需求阶段正序';
-$lang->kanban->orderList['stage_desc'] = '需求阶段倒序';
-$lang->kanban->orderList['assignedTo'] = '指派给';
+$lang->kanban->orderList['id_asc']          = '需求ID正序';
+$lang->kanban->orderList['id_desc']         = '需求ID倒序';
+$lang->kanban->orderList['pri_asc']         = '需求优先级正序';
+$lang->kanban->orderList['pri_desc']        = '需求优先级倒序';
+$lang->kanban->orderList['stage_asc']       = '需求阶段正序';
+$lang->kanban->orderList['stage_desc']      = '需求阶段倒序';
+$lang->kanban->orderList['assignedTo_desc'] = '指派给';
 
 $lang->kanban->importList = array();
 $lang->kanban->importList['off'] = '不启用导入功能';
diff --git a/module/task/css/view.css b/module/task/css/view.css
index 06e13d58a9..308b600e3f 100644
--- a/module/task/css/view.css
+++ b/module/task/css/view.css
@@ -18,3 +18,5 @@
 .c-consumedAB {width: 60px;}
 .c-leftAB {width: 60px;}
 .c-actions {width: 175px;}
+
+#mainContent .main-actions .btn-toolbar .btn {padding-left: 7px; padding-right: 6px;}
diff --git a/module/testtask/css/create.css b/module/testtask/css/create.css
index 33976882a6..ac95ac79ff 100644
--- a/module/testtask/css/create.css
+++ b/module/testtask/css/create.css
@@ -1,3 +1,5 @@
 #mailtoGroup .chosen-container-single a {border-left-width: 0px;}
 #ownerAndPriBox .picker .picker-selections .picker-selection {width: 158px;}
 .table tbody>tr>td {width: 400px;}
+[lang^='en'] .table tbody>tr>td, [lang^='de'].table tbody>tr>td {width: 460px;}
+[lang^='fr'] .table tbody>tr>td {width: 480px;}
diff --git a/module/testtask/css/edit.css b/module/testtask/css/edit.css
index 33976882a6..ac95ac79ff 100644
--- a/module/testtask/css/edit.css
+++ b/module/testtask/css/edit.css
@@ -1,3 +1,5 @@
 #mailtoGroup .chosen-container-single a {border-left-width: 0px;}
 #ownerAndPriBox .picker .picker-selections .picker-selection {width: 158px;}
 .table tbody>tr>td {width: 400px;}
+[lang^='en'] .table tbody>tr>td, [lang^='de'].table tbody>tr>td {width: 460px;}
+[lang^='fr'] .table tbody>tr>td {width: 480px;}