diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 8e359d54cb..772c24ff55 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -73,7 +73,7 @@
             }
             elseif($action->objectType == 'kanbancard')
             {
-                echo html::a($this->createLink('kanban', 'viewCard', "id=$action->objectID", '', true), $action->objectName, '', "title={$action->objectName} class='iframe'");
+                echo html::a($this->createLink('kanban', 'viewCard', "id=$action->objectID", '', true), $action->objectName, '', "title={$action->objectName} class='iframe' data-width=80%");
             }
             else
             {
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 7d1bb57f52..7fb3631594 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -663,6 +663,7 @@ $lang->resource->kanban->laneMove           = 'laneMove';
 $lang->resource->kanban->cardsSort          = 'cardsSort';
 $lang->resource->kanban->viewArchivedColumn = 'viewArchivedColumn';
 $lang->resource->kanban->viewArchivedCard   = 'viewArchivedCard';
+$lang->resource->kanban->restoreCard        = 'restoreCard';
 
 $lang->kanban->methodOrder[5]   = 'space';
 $lang->kanban->methodOrder[10]  = 'createSpace';
@@ -706,6 +707,7 @@ $lang->kanban->methodorder[190] = 'cardsSort';
 $lang->kanban->methodOrder[195] = 'viewArchivedColumn';
 $lang->kanban->methodorder[200] = 'viewArchivedCard';
 $lang->kanban->methodorder[205] = 'archiveColumn';
+$lang->kanban->methodorder[210] = 'restoreCard';
 
 /* Execution. */
 $lang->resource->execution = new stdclass();
diff --git a/module/kanban/css/createcard.css b/module/kanban/css/createcard.css
index 31cde3e7c8..3ac8e1d763 100644
--- a/module/kanban/css/createcard.css
+++ b/module/kanban/css/createcard.css
@@ -1,2 +1,2 @@
-#nameBox .required:after {right: 130px; z-index: 2;}
-#nameBox .br-0 {height: 32px;}
+.pri-selector .br-0 {padding-bottom: 5px;}
+.required:after {left: 215px; z-index: 2;}
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 0b1a27ff52..2f8ef62ffd 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -50,6 +50,7 @@ $lang->kanban->viewArchivedColumn  = 'View archived column';
 $lang->kanban->archivedColumn      = 'Archived Column';
 $lang->kanban->archivedCard        = 'Archived Card';
 $lang->kanban->restoreColumn       = 'Restore Column';
+$lang->kanban->restoreCard         = 'Restore Card';
 $lang->kanban->restore             = 'Restore';
 $lang->kanban->child               = 'Child';
 
@@ -286,6 +287,7 @@ $lang->kanbancard->noAssigned      = 'No Assigned';
 $lang->kanbancard->deadlineAB      = 'DL';
 $lang->kanbancard->beginAB         = 'Begin';
 $lang->kanbancard->to              = '~';
+$lang->kanbancard->archived        = 'Archived';
 
 $lang->kanbancard->confirmArchive    = 'Are you sure to archive this card? After archiving the card, it will be hidden from the column and you can view it in the Region - Archived.';
 $lang->kanbancard->confirmDelete     = 'Are you sure to delete this card? After deleting the card, it will be deleted from the Kanban. You can only view it in the system recycle bin.';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index a1fd1db494..3019ecd37a 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -50,6 +50,7 @@ $lang->kanban->viewArchivedColumn  = '查看已归档列';
 $lang->kanban->archivedColumn      = '已归档的看板列';
 $lang->kanban->archivedCard        = '已归档的卡片';
 $lang->kanban->restoreColumn       = '还原看板列';
+$lang->kanban->restoreCard         = '还原卡片';
 $lang->kanban->restore             = '还原';
 $lang->kanban->child               = '子';
 
@@ -286,6 +287,7 @@ $lang->kanbancard->noAssigned      = '未指派';
 $lang->kanbancard->deadlineAB      = '截止';
 $lang->kanbancard->beginAB         = '开始';
 $lang->kanbancard->to              = '~';
+$lang->kanbancard->archived        = '已归档';
 
 $lang->kanbancard->confirmArchive    = '您确认归档该卡片吗？归档卡片后，该卡片将从列中隐藏，您可以在区域-已归档中查看。';
 $lang->kanbancard->confirmDelete     = '您确认删除该卡片吗？删除卡片后，该卡片将从看板中删除，您只能通过系统回收站查看。';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 8e78b8f9ae..80b4460c69 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -2266,7 +2266,7 @@ class kanbanModel extends model
      * @access public
      * @return array
      */
-    public function getCardsByObject($objectType = '', $objectID = 0, $archived = 0, $deleted = 0)
+    public function getCardsByObject($objectType = '', $objectID = 0, $archived = 0, $deleted = '0')
     {
         return $this->dao->select('*')->from(TABLE_KANBANCARD)
             ->where(true)
diff --git a/module/kanban/view/space.html.php b/module/kanban/view/space.html.php
index e893e8a616..3d8dbb6a9e 100644
--- a/module/kanban/view/space.html.php
+++ b/module/kanban/view/space.html.php
@@ -141,7 +141,7 @@
                 <div class='kanbanAcl'>
                   <?php $icon = $kanban->acl == 'open' ? 'unlock' : 'lock';?>
                     <i class="<?php echo 'icon-' . $icon;?>"></i>
-                  <?php echo zget($lang->kanban->aclGroup, $kanban->acl, '');?>
+                  <?php echo zget($lang->kanban->aclGroup, $kanban->acl == 'open' ? 'open' : 'private', '');?>
                 </div>
               </div>
             </div>
diff --git a/module/kanban/view/viewcard.html.php b/module/kanban/view/viewcard.html.php
index 3c401d32d2..35a3f42fbf 100644
--- a/module/kanban/view/viewcard.html.php
+++ b/module/kanban/view/viewcard.html.php
@@ -36,10 +36,13 @@
       <div class="btn-toolbar">
         <?php if(!$card->deleted):?>
         <?php
-        common::printLink('kanban', 'assigntoCard', "cardID=$card->id", "<i class='icon icon-hand-right'></i><span class='text'>{$lang->kanbancard->assign}</span>", '', "class='btn btn-link iframe' title='{$lang->kanbancard->assign}'", true, true);
-        common::printLink('kanban', 'archiveCard',  "cardID=$card->id", "<i class='icon icon-ban-circle'></i><span class='text'>{$lang->kanbancard->archive}</span>", 'hiddenwin', "class='btn btn-link' title='{$lang->kanbancard->archive}'", true, true);
+        //common::printLink('kanban', 'assigntoCard', "cardID=$card->id", "<i class='icon icon-hand-right'></i><span class='text'>{$lang->kanbancard->assign}</span>", '', "class='btn btn-link iframe' title='{$lang->kanbancard->assign}'", true, true);
+        if(!$card->archived)
+        {
+            common::printLink('kanban', 'archiveCard',  "cardID=$card->id", "<i class='icon icon-ban-circle'></i><span class='text'>{$lang->kanbancard->archive}</span>", 'hiddenwin', "class='btn btn-link' title='{$lang->kanbancard->archive}'", true, true);
 
-        echo "<div class='divider'></div>";
+            echo "<div class='divider'></div>";
+        }
 
         common::printLink('kanban', 'editCard',   "cardID=$card->id", '<i class="icon icon-edit"></i>',  '', "class='btn btn-link iframe' data-width='80%' title='{$lang->kanbancard->edit}'",  true, true);
         common::printLink('kanban', 'copyCard',   "cardID=$card->id", '<i class="icon icon-copy"></i>',  '', "class='btn btn-link iframe' title='{$lang->kanbancard->copy}'",  true, true);