diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index b01e13c585..ead807410e 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -22,3 +22,4 @@ td.flex span.project-type-label {margin-left: 5px; min-width: 36px;}
 .c-progress, .c-burn {width: 60px;}
 .c-percent, .c-realBegan, .c-end, .c-begin, .c-realEnd{width: 100px;}
 .c-action {text-align: center;}
+.c-name > span {margin-right: 2px;}
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 40578c1152..0c9e2b4696 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -424,6 +424,7 @@ $lang->printKanban->typeList['increment'] = 'Increment';
 $lang->execution->typeList['']       = '';
 $lang->execution->typeList['stage']  = 'Stage';
 $lang->execution->typeList['sprint'] = $lang->executionCommon;
+$lang->execution->typeList['kanban'] = 'Kanban';
 
 $lang->execution->featureBar['task']['all']          = $lang->execution->allTasks;
 $lang->execution->featureBar['task']['unclosed']     = $lang->execution->unclosed;
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index f33c35aeac..a9c80f9ddf 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -424,6 +424,7 @@ $lang->printKanban->typeList['increment'] = '增量';
 $lang->execution->typeList['']       = '';
 $lang->execution->typeList['stage']  = '阶段';
 $lang->execution->typeList['sprint'] = $lang->executionCommon;
+$lang->execution->typeList['kanban'] = '看板';
 
 $lang->execution->featureBar['task']['all']          = $lang->execution->allTasks;
 $lang->execution->featureBar['task']['unclosed']     = $lang->execution->unclosed;
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 3652b0b19f..38e8118dfb 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -118,9 +118,7 @@
             <?php printf('%03d', $execution->id);?>
           </td>
           <td class='text-left c-name <?php if(!empty($execution->children)) echo 'has-child';?> flex' title='<?php echo $execution->name?>'>
-            <?php if(isset($this->config->maxVersion)):?>
-            <span class='project-type-label label label-outline <?php echo $execution->type == 'sprint' ? 'label-info' : 'label-warning';?>'><?php echo $lang->execution->typeList[$execution->type]?></span>
-            <?php endif;?>
+            <span class='project-type-label label label-outline <?php echo $execution->type == 'stage' ? 'label-warning' : 'label-info';?>'><?php echo $lang->execution->typeList[$execution->type]?></span>
             <?php
             $executionLink = $execution->projectModel == 'kanban' ? html::a($this->createLink('execution', 'kanban', 'executionID=' . $execution->id), $execution->name, '', "class='text-ellipsis'") : html::a($this->createLink('execution', 'task', 'execution=' . $execution->id), $execution->name, '', "class='text-ellipsis'");
             echo !empty($execution->children) ? $execution->name :  $executionLink;
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index babdc60730..55b33e55a1 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -102,10 +102,10 @@ js::set('hasTaskButton', $hasTaskButton);
         $actions .= html::a('javascript:;', "<i class='icon icon-cog-outline'></i>" . $lang->kanban->setting, '', "data-toggle='dropdown' class='btn btn-link'");
         $actions .= "<ul id='kanbanActionMenu' class='dropdown-menu pull-right'>";
         $width    = $this->app->getClientLang() == 'en' ? '70%' : '60%';
-        if(common::hasPriv('kanban', 'createRegion')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-plus"></i>' . $lang->kanban->createRegion, '', "class='iframe btn btn-link'") . '</li>';
-        if(common::hasPriv('kanban', 'setLaneHeight')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'setLaneHeight', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-size-height"></i>' . $lang->kanban->laneHeight, '', "class='iframe btn btn-link' data-width=$width") . '</li>';
+        if(common::hasPriv('kanban', 'createRegion')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-plus"></i>' . $lang->kanban->createRegion, '', "class='iframe btn btn-link text-left'") . '</li>';
+        if(common::hasPriv('kanban', 'setLaneHeight')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'setLaneHeight', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-size-height"></i>' . $lang->kanban->laneHeight, '', "class='iframe btn btn-link text-left' data-width=$width") . '</li>';
         $kanbanActions = '';
-        if(common::hasPriv('execution', 'edit')) $kanbanActions .= '<li>' . html::a(helper::createLink('execution', 'edit', "executionID=$execution->id", '', true), '<i class="icon icon-edit"></i>' . $lang->kanban->edit, '', "class='iframe btn btn-link' data-width='75%'") . '</li>';
+        if(common::hasPriv('execution', 'edit')) $kanbanActions .= '<li>' . html::a(helper::createLink('execution', 'edit', "executionID=$execution->id", '', true), '<i class="icon icon-edit"></i>' . $lang->kanban->edit, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';
         if(in_array('start', $executionActions)) $kanbanActions .= '<li>' . html::a(helper::createLink('execution', 'start', "executionID=$execution->id", '', true), '<i class="icon icon-play"></i>' . $lang->execution->start, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';
         if(in_array('putoff', $executionActions)) $kanbanActions .= '<li>' . html::a(helper::createLink('execution', 'putoff', "executionID=$execution->id", '', true), '<i class="icon icon-calendar"></i>' . $lang->execution->putoff, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';
         if(in_array('suspend', $executionActions)) $kanbanActions .= '<li>' . html::a(helper::createLink('execution', 'suspend', "executionID=$execution->id", '', true), '<i class="icon icon-pause"></i>' . $lang->execution->suspend, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 68073e31d5..484c0196f3 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -254,8 +254,8 @@ $lang->kanbanlane->WIPType   = 'Lane WIP Type';
 $lang->kanbanlane->confirmDelete    = 'Are you sure to delete this lane? After deleting the lane, all data (columns and cards) in the lane will also be deleted.';
 $lang->kanbanlane->confirmDeleteTip = 'Are you sure to delete this lane? After deleting the lane, all %s in the lane will be hidden.';
 
-$lang->kanbanlane->modeList['sameAsOther'] = 'Use the same Kanban column as other lanes';
-$lang->kanbanlane->modeList['independent'] = 'Independent Kanban column is adopted';
+$lang->kanbanlane->modeList['sameAsOther'] = 'Use the same Kanban column';
+$lang->kanbanlane->modeList['independent'] = 'Independent Kanban column';
 
 $lang->kanbanlane->heightTypeList['auto']   = 'Adaptive (Adaptive according to the card height)';
 $lang->kanbanlane->heightTypeList['custom'] = 'Custom (Customize lane height based on number of cards)';
diff --git a/module/project/model.php b/module/project/model.php
index 60b703035a..5d59ff7334 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1569,7 +1569,8 @@ class projectModel extends model
                     $prefix = '';
                     $suffix = '';
                     if($project->model === 'waterfall') $prefix = "<span class='project-type-label label label-outline label-warning'>{$this->lang->project->waterfall}</span> ";
-                    if($project->model === 'scrum')     $prefix = "<span class='project-type-label label label-outline label-info'>{$this->lang->project->scrum}</span> ";
+                    if($project->model === 'scrum') $prefix = "<span class='project-type-label label label-outline label-info'>{$this->lang->project->scrum}</span> ";
+                    if($project->model === 'kanban') $prefix = "<span class='project-type-label label label-outline label-info'>{$this->lang->project->kanban}</span> ";
                     if(isset($project->delay)) $suffix = "<span class='label label-danger label-badge'>{$this->lang->project->statusList['delay']}</span>";
                     if(!empty($suffix) || !empty($prefix)) echo '<div class="project-name' . (empty($prefix) ? '' : ' has-prefix') . (empty($suffix) ? '' : ' has-suffix') . '">';
                     if(!empty($prefix)) echo $prefix;
@@ -1633,20 +1634,21 @@ class projectModel extends model
                     }
 
                     $from     = $project->from == 'project' ? 'project' : 'pgmproject';
-                    $iframe   = $this->app->tab == 'program' ? 'iframe' : '';
-                    $onlyBody = $this->app->tab == 'program' ? true : '';
+                    $iframe   = ($this->app->tab == 'program' or $project->model == 'kanban') ? 'iframe' : '';
+                    $onlyBody = ($this->app->tab == 'program' or $project->model == 'kanban') ? true : '';
                     $dataApp  = $this->config->systemMode == 'classic' ? "data-app=execution" : "data-app=project";
-                    common::printIcon($moduleName, 'edit', "projectID=$project->id", $project, 'list', 'edit', '', $iframe, $onlyBody, $dataApp, '', $project->id);
-                    common::printIcon($moduleName, 'manageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', '', $dataApp, $this->lang->execution->team, $project->id);
-                    if($this->config->systemMode == 'new') common::printIcon('project', 'group', "projectID=$project->id&programID=$programID", $project, 'list', 'lock', '', '', '', $dataApp, '', $project->id);
+                    $attr     = $project->model == 'kanban' ? " disabled='disabled'" : '';
+                    common::printIcon($moduleName, 'edit', "projectID=$project->id", $project, 'list', 'edit', '', $iframe, $onlyBody, $dataApp);
+                    common::printIcon($moduleName, 'manageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', '', $dataApp . $attr, $this->lang->execution->team);
+                    if($this->config->systemMode == 'new') common::printIcon('project', 'group', "projectID=$project->id&programID=$programID", $project, 'list', 'lock', '', '', '', $dataApp . $attr);
 
                     if(common::hasPriv($moduleName, 'manageProducts') || common::hasPriv($moduleName, 'whitelist') || common::hasPriv($moduleName, 'delete'))
                     {
                         echo "<div class='btn-group'>";
                         echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
                         echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
-                        common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', $dataApp, $this->lang->project->manageProducts, $project->id);
-                        if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', $dataApp, '', $project->id);
+                        common::printIcon($moduleName, 'manageProducts', "projectID=$project->id", $project, 'list', 'link', '', 'btn-action', '', $dataApp . $attr, $this->lang->project->manageProducts);
+                        if($this->config->systemMode == 'new') common::printIcon('project', 'whitelist', "projectID=$project->id&module=project&from=$from", $project, 'list', 'shield-check', '', 'btn-action', '', $dataApp . $attr);
                         if(common::hasPriv($moduleName, 'delete')) echo html::a(helper::createLink($moduleName, "delete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn btn-action' title='{$this->lang->project->delete}'");
                         echo "</ul>";
                         echo "</div>";
diff --git a/module/project/view/browsebycard.html.php b/module/project/view/browsebycard.html.php
index 38d25b05ad..04a708ee67 100644
--- a/module/project/view/browsebycard.html.php
+++ b/module/project/view/browsebycard.html.php
@@ -84,10 +84,8 @@
     <div class="table-empty-tip">
       <p>
         <span class="text-muted"><?php echo $lang->project->empty;?></span>
-        <?php if(isset($this->config->maxVersion) and !defined('TUTORIAL')):?>
+        <?php if(!defined('TUTORIAL')):?>
         <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info" data-toggle="modal" data-target="#guideDialog"');?>
-        <?php elseif($this->config->systemMode == 'new'):?>
-        <?php common::printLink('project', 'create', 'mode=scrum', '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info"');?>
         <?php else:?>
         <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i> ' . $lang->execution->create, '', 'class="btn btn-info"');?>
         <?php endif;?>
@@ -102,9 +100,11 @@
           <span class="label label-<?php echo $status;?>"><?php echo $lang->project->statusList[$status];?></span>
         </div>
         <div class='panel-heading'>
-          <?php if(isset($config->maxVersion) and $project->model === 'waterfall'):?>
+          <?php if($project->model === 'waterfall'):?>
           <span class='project-type-label label label-warning label-outline'><i class='icon icon-waterfall'></i></span>
-          <?php elseif(isset($config->maxVersion)):?>
+          <?php elseif($project->model === 'kanban'):?>
+          <span class='project-type-label label label-info label-outline'><i class='icon icon-kanban'></i></span>
+          <?php else:?>
           <span class='project-type-label label label-info label-outline'><i class='icon icon-sprint'></i></span>
           <?php endif;?>
           <strong class='project-name' title='<?php echo $project->name;?>'><?php echo html::a(helper::createLink('project', 'index', "projectID=$projectID"), $project->name);?></strong>
@@ -174,7 +174,9 @@
                 <?php echo html::a('javascript:;', "<i class='icon icon-ellipsis-v'></i>", '', "data-toggle='dropdown' class='btn btn-link'");?>
                 <ul class='dropdown-menu pull-right'>
                   <?php
-                  common::printIcon('project', 'edit',     "projectID=$project->id", $project, 'list', 'edit',  '', 'btn-action');
+                  $iframe   = $project->model == 'kanban' ? ' iframe' : '';
+                  $onlyBody = $project->model == 'kanban' ? true : '';
+                  common::printIcon('project', 'edit',     "projectID=$project->id", $project, 'list', 'edit',  '', 'btn-action' . $iframe, $onlyBody);
                   common::printIcon('project', 'start',    "projectID=$project->id", $project, 'list', 'play',  '', 'iframe btn-action', true);
                   common::printIcon('project', 'suspend',  "projectID=$project->id", $project, 'list', 'pause', '', 'iframe btn-action', true);
                   common::printIcon('project', 'close',    "projectID=$project->id", $project, 'list', 'off',   '', 'iframe btn-action', true);
diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php
index 42ccaea695..b7c85afe52 100644
--- a/module/project/view/browsebylist.html.php
+++ b/module/project/view/browsebylist.html.php
@@ -73,8 +73,6 @@
         <span class="text-muted"><?php echo $lang->project->empty;?></span>
         <?php if(!defined('TUTORIAL')):?>
         <?php if(common::hasPriv('project', 'create')) common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info" data-toggle="modal"');?>
-        <?php elseif($this->config->systemMode == 'new'):?>
-        <?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info"');?>
         <?php else:?>
         <?php common::printLink('execution', 'create', '', '<i class="icon icon-plus"></i> ' . $lang->execution->create, '', 'class="btn btn-info"');?>
         <?php endif;?>