diff --git a/module/action/model.php b/module/action/model.php
index e819d4e5cf..dc41f077dc 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1293,7 +1293,7 @@ class actionModel extends model
                 if($action->objectType == 'execution')
                 {
                     $execution = $this->loadModel('execution')->getById($action->objectID);
-                    if($execution->type == 'kanban') $action->objectLink = helper::createLink('execution', 'kanban', "executionID={$action->objectID}");
+                    if(!empty($execution) and $execution->type == 'kanban') $action->objectLink = helper::createLink('execution', 'kanban', "executionID={$action->objectID}");
                 }
 
                 if($action->objectType == 'doclib')
diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index 63a6bbf985..cb73ca4326 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -117,6 +117,7 @@ $lang->icons['mail']      = 'envelope';
 $lang->icons['trash']     = 'trash';
 $lang->icons['extension'] = 'th-large';
 $lang->icons['app']       = 'th-large';
+$lang->icons['kanban']    = 'kanban';
 
 $lang->icons['results']            = 'list-alt';
 $lang->icons['create']             = 'plus';
diff --git a/module/execution/control.php b/module/execution/control.php
index b1eca16588..d3e9ba7969 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1271,6 +1271,7 @@ class execution extends control
             $this->lang->execution->execCode    = str_replace($this->lang->execution->common, $this->lang->execution->kanban, $this->lang->execution->execCode);
             $this->lang->execution->execDesc    = str_replace($this->lang->execution->common, $this->lang->execution->kanban, $this->lang->execution->execDesc);
             $this->lang->execution->copyExec    = str_replace($this->lang->execution->common, $this->lang->execution->kanban, $this->lang->execution->copyExec);
+            $this->lang->execution->create      = str_replace($this->lang->executionCommon, $this->lang->execution->kanban, $this->lang->execution->create);
             $this->lang->execution->copy        = str_replace($this->lang->executionCommon, $this->lang->execution->kanban, $this->lang->execution->copy);
             $this->lang->execution->PM          = str_replace($this->lang->executionCommon, $this->lang->execution->kanban, $this->lang->execution->PM);
             $this->lang->execution->name        = str_replace($this->lang->executionCommon, $this->lang->execution->kanban, $this->lang->execution->name);
diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php
index d007eb49c4..8ca002d7b9 100644
--- a/module/project/view/index.html.php
+++ b/module/project/view/index.html.php
@@ -24,7 +24,7 @@
     ?>
   </div>
   <div class='btn-toolbar pull-right'>
-    <?php echo html::a($this->createLink('execution', 'create', "projectID=$project->id"), "<i class='icon icon-sm icon-plus'></i> " . $lang->project->createKanban, '', "class='btn btn-primary create-execution-btn'");?>
+    <?php common::printLink('execution', 'create', "projectID=$project->id", '<i class="icon icon-plus"></i> ' . $lang->project->createKanban, '', 'class="btn btn-primary"');?>
   </div>
 </div>
 <div id="mainContent">
@@ -60,7 +60,7 @@
                  {
                      $this->app->loadLang('kanban');
                      echo '<li>';
-                     common::printLink('project', 'edit',   "projectID={$project->id}", '<i class="icon icon-edit"></i> ' . $lang->kanban->edit, '', "class='iframe' data-width='75%'", '', true);
+                     common::printLink('execution', 'edit', "executionID={$kanbanID}", '<i class="icon icon-edit"></i> ' . $lang->kanban->edit, '', "class='iframe' data-width='75%'", '', true);
                      echo '</li>';
                  }
                  if(in_array('start', $executionActions[$kanbanID])) echo '<li>' . html::a(helper::createLink('execution', 'start', "executionID=$kanbanID", '', true), '<i class="icon icon-play"></i>' . $lang->execution->start, '', "class='iframe btn btn-link text-left' data-width='75%'") . '</li>';