diff --git a/extension/lite/product/ext/config/lite.php b/extension/lite/product/ext/config/lite.php
new file mode 100644
index 0000000000..14aec8c4a7
--- /dev/null
+++ b/extension/lite/product/ext/config/lite.php
@@ -0,0 +1,7 @@
+<?php
+unset($config->product->search['fields']['stage']);
+unset($config->product->search['fields']['product']);
+unset($config->product->search['fields']['plan']);
+unset($config->product->search['fields']['source']);
+unset($config->product->search['fields']['sourceNote']);
+unset($config->product->search['fields']['fromBug']);
diff --git a/extension/lite/product/ext/view/browse.lite.html.hook.php b/extension/lite/product/ext/view/browse.lite.html.hook.php
deleted file mode 100644
index 6ac5e2da04..0000000000
--- a/extension/lite/product/ext/view/browse.lite.html.hook.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php if($this->app->rawModule == 'projectstory'):?>
-<script>
-$('td.c-actions .icon-projectstory-unlinkStory').parent().remove();
-$('td.c-actions .icon-testcase-create').parent().remove();
-</script>
-<?php endif;?>
diff --git a/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php b/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
index 93373fe779..f9ced5a133 100644
--- a/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
+++ b/extension/lite/todo/ext/view/batchcreate.lite.html.hook.php
@@ -1,6 +1,8 @@
+<?php $html = '<div class="divider"></div><button id="closeModal" type="button" class="btn btn-link" data-dismiss="modal"><i class="icon icon-close"></i></button>';?>
 <script>
 $(function()
 {
     for(var index = 0; index <= 9; index++) $('#todoBatchAddForm').append(`<input type="hidden" name="vision[${index}]" id="vision[${index}]" value="lite">`);
+    $('#mainContent .main-header .pull-right.btn-toolbar').append(<?php echo json_encode($html)?>);
 });
 </script>
diff --git a/module/program/model.php b/module/program/model.php
index df0c013409..6f886c80c2 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -133,6 +133,7 @@ class programModel extends model
         return $this->dao->select('*')->from(TABLE_PROGRAM)
             ->where('type')->in('program,project')
             ->andWhere('deleted')->eq(0)
+            ->andWhere('vision')->eq($this->config->vision)
             ->beginIF(!$this->app->user->admin)
             ->andWhere('(id')->in($this->app->user->view->programs)
             ->orWhere('id')->in($this->app->user->view->projects)
diff --git a/module/story/model.php b/module/story/model.php
index 8d2a8bc390..47442e4014 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3982,9 +3982,9 @@ class storyModel extends model
                     common::printIcon('story', 'recall', $vars, $story, 'list', 'back', 'hiddenwin', '', '', '', $this->lang->story->recall);
                     common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true);
                     common::printIcon('story', 'edit', $vars . "&from=$story->from", $story, 'list', '', '', '', false, "data-group=$story->from");
-                    if($story->type != 'requirement') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'");
+                    if($story->type != 'requirement' and $this->config->vision != 'lite') common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$vars", $story, 'list', 'sitemap', '', '', false, "data-app='qa'");
                     if($this->app->rawModule != 'projectstory' OR $this->config->vision == 'lite') common::printIcon('story', 'batchCreate', "productID=$story->product&branch=$story->branch&module=$story->module&storyID=$story->id", $story, 'list', 'split', '', '', '', '', $this->lang->story->subdivide);
-                    if($this->app->rawModule == 'projectstory') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->project}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin');
+                    if($this->app->rawModule == 'projectstory' and $this->config->vision != 'lite') common::printIcon('projectstory', 'unlinkStory', "projectID={$this->session->project}&storyID=$story->id", '', 'list', 'unlink', 'hiddenwin');
                 }
                 else
                 {