diff --git a/module/project/control.php b/module/project/control.php
index e86fecd892..2c8976786e 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -526,7 +526,7 @@ class project extends control
      * @access public
      * @return void
      */
-    public function story($projectID = 0, $orderBy = '')
+    public function story($projectID = 0, $orderBy = '', $type = 'byModule', $param = 0)
     {
         /* Load these models. */
         $this->loadModel('story');
@@ -552,7 +552,7 @@ class project extends control
         $position[] = $this->lang->project->story;
 
         /* The pager. */
-        $stories    = $this->story->getProjectStories($projectID, $sort);
+        $stories    = $this->story->getProjectStories($projectID, $sort, $type, $param);
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
         $storyTasks = $this->task->getStoryTaskCounts(array_keys($stories), $projectID);
         $users      = $this->user->getPairs('noletter');
@@ -574,7 +574,10 @@ class project extends control
         $this->view->stories    = $stories;
         $this->view->summary    = $this->product->summary($stories);
         $this->view->orderBy    = $orderBy;
+        $this->view->type       = $type;
+        $this->view->param      = $param;
         $this->view->storyTasks = $storyTasks;
+        $this->view->moduleTree = $this->loadModel('tree')->getTaskTreeMenu($projectID, $productID = 0, $startModuleID = 0, array('treeModel', 'createProjectStoryLink'));
         $this->view->tabID      = 'story';
         $this->view->users      = $users;
 
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index 84c9cffa54..4fd97898bd 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
+<?php include '../../common/view/treeview.html.php';?>
 <?php js::set('confirmUnlinkStory', $lang->project->confirmUnlinkStory)?>
 <div id='titlebar'>
   <div class='heading'><?php echo html::icon($lang->icons['story']);?> <?php echo $lang->project->story;?></div>
@@ -28,114 +29,128 @@
     </div>
   </div>
 </div>
-<form method='post' id='projectStoryForm'>
-  <table class='table tablesorter table-condensed table-fixed' id='storyList'>
-    <thead>
-      <tr class='colhead'>
-      <?php $vars = "projectID={$project->id}&orderBy=%s"; ?>
-        <th class='w-id  {sorter:false}'>    <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
-        <th class='w-pri {sorter:false}'>    <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
-        <th class='{sorter:false}'>          <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
-        <th class='w-user {sorter:false}'>   <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-        <th class='w-80px {sorter:false}'>   <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-        <th class='w-hour {sorter:false}'>   <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
-        <th class='w-hour {sorter:false}'>   <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
-        <th class='w-70px {sorter:false}'> <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
-        <th class='w-70px'>                  <?php echo $lang->story->taskCount;?></th>
-        <th class='w-110px {sorter:false}'>  <?php echo $lang->actions;?></th>
-      </tr>
-    </thead>
-    <tbody>
-      <?php
-      $totalEstimate = 0;
-      $canBatchEdit  = common::hasPriv('story', 'batchEdit');
-      $canBatchClose = common::hasPriv('story', 'batchClose');
-      ?>
-      <?php foreach($stories as $key => $story):?>
-      <?php
-      $storyLink      = $this->createLink('story', 'view', "storyID=$story->id");
-      $totalEstimate += $story->estimate;
-      ?>
-      <tr class='text-center' id="story<?php echo $story->id?>">
-        <td class='text-left'>
-          <?php if($canBatchEdit or $canBatchClose):?>
-          <input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' /> 
-          <?php endif;?>
-          <?php echo html::a($storyLink, sprintf('%03d', $story->id));?>
-        </td>
-        <td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
-        <td class='text-left' title="<?php echo $story->title?>"><?php echo html::a($storyLink,$story->title);?></td>
-        <td><?php echo $users[$story->openedBy];?></td>
-        <td><?php echo $users[$story->assignedTo];?></td>
-        <td><?php echo $story->estimate;?></td>
-        <td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
-        <td><?php echo $lang->story->stageList[$story->stage];?></td>
-        <td class='linkbox'>
-          <?php
-          $tasksLink = $this->createLink('story', 'tasks', "storyID=$story->id&projectID=$project->id");
-          $storyTasks[$story->id] > 0 ? print(html::a($tasksLink, $storyTasks[$story->id], '', 'class="iframe"')) : print(0);
-          ?> 
-        </td>
-        <td>
-          <?php 
-          $param = "projectID={$project->id}&story={$story->id}&moduleID={$story->module}";
 
-          $lang->task->create = $lang->project->wbs;
-          common::printIcon('task', 'create', $param, '', 'list', 'smile');
+<div class='side' id='taskTree'>
+  <a class='side-handle' data-id='projectTree'><i class='icon-caret-left'></i></a>
+  <div class='side-body'>
+    <div class='panel panel-sm'>
+      <div class='panel-heading nobr'>
+        <?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->name;?></strong>
+      </div>
+      <div class='panel-body'><?php echo $moduleTree;?></div>
+    </div>
+  </div>
+</div>
+<div class='main'>
+  <form method='post' id='projectStoryForm'>
+    <table class='table tablesorter table-condensed table-fixed' id='storyList'>
+      <thead>
+        <tr class='colhead'>
+        <?php $vars = "projectID={$project->id}&orderBy=%s&type=$type&param=$param"; ?>
+          <th class='w-id  {sorter:false}'>    <?php common::printOrderLink('id',         $orderBy, $vars, $lang->idAB);?></th>
+          <th class='w-pri {sorter:false}'>    <?php common::printOrderLink('pri',        $orderBy, $vars, $lang->priAB);?></th>
+          <th class='{sorter:false}'>          <?php common::printOrderLink('title',      $orderBy, $vars, $lang->story->title);?></th>
+          <th class='w-user {sorter:false}'>   <?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+          <th class='w-80px {sorter:false}'>   <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+          <th class='w-hour {sorter:false}'>   <?php common::printOrderLink('estimate',   $orderBy, $vars, $lang->story->estimateAB);?></th>
+          <th class='w-hour {sorter:false}'>   <?php common::printOrderLink('status',     $orderBy, $vars, $lang->statusAB);?></th>
+          <th class='w-70px {sorter:false}'> <?php common::printOrderLink('stage',      $orderBy, $vars, $lang->story->stageAB);?></th>
+          <th class='w-70px'>                  <?php echo $lang->story->taskCount;?></th>
+          <th class='w-110px {sorter:false}'>  <?php echo $lang->actions;?></th>
+        </tr>
+      </thead>
+      <tbody>
+        <?php
+        $totalEstimate = 0;
+        $canBatchEdit  = common::hasPriv('story', 'batchEdit');
+        $canBatchClose = common::hasPriv('story', 'batchClose');
+        ?>
+        <?php foreach($stories as $key => $story):?>
+        <?php
+        $storyLink      = $this->createLink('story', 'view', "storyID=$story->id");
+        $totalEstimate += $story->estimate;
+        ?>
+        <tr class='text-center' id="story<?php echo $story->id?>">
+          <td class='text-left'>
+            <?php if($canBatchEdit or $canBatchClose):?>
+            <input type='checkbox' name='storyIDList[<?php echo $story->id;?>]' value='<?php echo $story->id;?>' /> 
+            <?php endif;?>
+            <?php echo html::a($storyLink, sprintf('%03d', $story->id));?>
+          </td>
+          <td><span class='<?php echo 'pri' . zget($lang->story->priList, $story->pri, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
+          <td class='text-left' title="<?php echo $story->title?>"><?php echo html::a($storyLink,$story->title);?></td>
+          <td><?php echo $users[$story->openedBy];?></td>
+          <td><?php echo $users[$story->assignedTo];?></td>
+          <td><?php echo $story->estimate;?></td>
+          <td class='story-<?php echo $story->status;?>'><?php echo $lang->story->statusList[$story->status];?></td>
+          <td><?php echo $lang->story->stageList[$story->stage];?></td>
+          <td class='linkbox'>
+            <?php
+            $tasksLink = $this->createLink('story', 'tasks', "storyID=$story->id&projectID=$project->id");
+            $storyTasks[$story->id] > 0 ? print(html::a($tasksLink, $storyTasks[$story->id], '', 'class="iframe"')) : print(0);
+            ?> 
+          </td>
+          <td>
+            <?php 
+            $param = "projectID={$project->id}&story={$story->id}&moduleID={$story->module}";
 
-          $lang->task->batchCreate = $lang->project->batchWBS;
-          common::printIcon('task', 'batchCreate', "projectID={$project->id}&story={$story->id}", '', 'list', 'stack');
+            $lang->task->create = $lang->project->wbs;
+            common::printIcon('task', 'create', $param, '', 'list', 'smile');
 
-          $lang->testcase->batchCreate = $lang->testcase->create;
-          if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'sitemap');
+            $lang->task->batchCreate = $lang->project->batchWBS;
+            common::printIcon('task', 'batchCreate', "projectID={$project->id}&story={$story->id}", '', 'list', 'stack');
 
-          if(common::hasPriv('project', 'unlinkStory'))
-          {
-              $unlinkURL = $this->createLink('project', 'unlinkStory', "projectID=$project->id&storyID=$story->id&confirm=yes");
-              echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn-icon' title='{$lang->project->unlinkStory}'");
-          }
-          ?>
-        </td>
-      </tr>
-      <?php endforeach;?>
-    </tbody>
-    <tfoot>
-      <tr>
-        <td colspan='10'>
-          <div class='table-actions clearfix'>
-          <?php
-          if(count($stories))
-          {
-            if($canBatchEdit or $canBatchClose) echo "<div class='btn-group'>" . html::selectButton() . '</div>';
+            $lang->testcase->batchCreate = $lang->testcase->create;
+            if($productID) common::printIcon('testcase', 'batchCreate', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '', 'list', 'sitemap');
 
-              echo "<div class='btn-group dropup'>";
-              if($canBatchEdit)
-              {
-                  $actionLink = $this->createLink('story', 'batchEdit', "productID=0&projectID=$project->id");
-                  echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
-              }
-              echo "<button id='moreAction' type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
-              echo "<ul class='dropdown-menu' id='moreActionMenu'>";
-              if($canBatchClose)
-              {
-                  $actionLink = $this->createLink('story', 'batchClose', "productID=0&projectID=$project->id");
-                  $misc       = "onclick=\"setFormAction('$actionLink')\"";
-                  echo '<li>' . html::a('#', $lang->close, '', $misc) . '</li>';
-              }
-              if(common::hasPriv('story', 'batchUnlinkStory'))
-              {
-                  $actionLink = $this->createLink('project', 'batchUnlinkStory', "projectID=$project->id");
-                  $misc       = "onclick=\"setFormAction('$actionLink')\"";
-                  echo '<li>' . html::a('#', $lang->project->unlinkStory, '', $misc) . '</li>';
-              }
-              echo '</ul></div>';
-          }
-          echo "<div class='text'>" . $summary . '</div>';
-          ?>
-          </div>
-        </td>
-      </tr>
-    </tfoot>
-  </table>
-</form>
+            if(common::hasPriv('project', 'unlinkStory'))
+            {
+                $unlinkURL = $this->createLink('project', 'unlinkStory', "projectID=$project->id&storyID=$story->id&confirm=yes");
+                echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"storyList\",confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn-icon' title='{$lang->project->unlinkStory}'");
+            }
+            ?>
+          </td>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
+      <tfoot>
+        <tr>
+          <td colspan='10'>
+            <div class='table-actions clearfix'>
+            <?php
+            if(count($stories))
+            {
+              if($canBatchEdit or $canBatchClose) echo "<div class='btn-group'>" . html::selectButton() . '</div>';
+
+                echo "<div class='btn-group dropup'>";
+                if($canBatchEdit)
+                {
+                    $actionLink = $this->createLink('story', 'batchEdit', "productID=0&projectID=$project->id");
+                    echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
+                }
+                echo "<button id='moreAction' type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
+                echo "<ul class='dropdown-menu' id='moreActionMenu'>";
+                if($canBatchClose)
+                {
+                    $actionLink = $this->createLink('story', 'batchClose', "productID=0&projectID=$project->id");
+                    $misc       = "onclick=\"setFormAction('$actionLink')\"";
+                    echo '<li>' . html::a('#', $lang->close, '', $misc) . '</li>';
+                }
+                if(common::hasPriv('story', 'batchUnlinkStory'))
+                {
+                    $actionLink = $this->createLink('project', 'batchUnlinkStory', "projectID=$project->id");
+                    $misc       = "onclick=\"setFormAction('$actionLink')\"";
+                    echo '<li>' . html::a('#', $lang->project->unlinkStory, '', $misc) . '</li>';
+                }
+                echo '</ul></div>';
+            }
+            echo "<div class='text'>" . $summary . '</div>';
+            ?>
+            </div>
+          </td>
+        </tr>
+      </tfoot>
+    </table>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/model.php b/module/story/model.php
index 0fab563a04..c95488dfd3 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -1191,11 +1191,14 @@ class storyModel extends model
      * @access public
      * @return array
      */
-    public function getProjectStories($projectID = 0, $orderBy = 'pri_asc,id_desc')
+    public function getProjectStories($projectID = 0, $orderBy = 'pri_asc,id_desc', $type = 'byModule', $param = 0)
     {
+        if($type == 'byModule' and $param) $modules = $this->dao->select('*')->from(TABLE_MODULE)->where('path')->like("%,$param,%")->andWhere('type')->eq('story')->fetchPairs('id', 'id');
         $stories = $this->dao->select('t1.*, t2.*')->from(TABLE_PROJECTSTORY)->alias('t1')
             ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
             ->where('t1.project')->eq((int)$projectID)
+            ->beginIF($type == 'byProduct')->andWhere('t1.product')->eq($param)->fi()
+            ->beginIF($type == 'byModule' and $param)->andWhere('t2.module')->in($modules)->fi()
             ->andWhere('t2.deleted')->eq(0)
             ->orderBy($orderBy)
             ->fetchAll('id');
diff --git a/module/tree/model.php b/module/tree/model.php
index 91035362a3..a84170a7be 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -353,7 +353,8 @@ class treeModel extends model
             }
             else
             {
-                $menu .= "<li>" . html::a(helper::createLink('project', 'task', "root=$rootID&status=byProduct&praram=$id"), $product, '_self', "id='product$id'");
+                $link  = $userFunc[1] == 'createProjectStoryLink' ? helper::createLink('project', 'story', "root=$rootID&orderBy=&status=byProduct&praram=$id") : helper::createLink('project', 'task', "root=$rootID&status=byProduct&praram=$id");
+                $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id'");
             }
 
             /* tree menu. */
@@ -620,6 +621,23 @@ class treeModel extends model
         return $linkHtml;
     }
 
+    /**
+     * Create link of project story. 
+     * 
+     * @param  string $type 
+     * @param  object $module 
+     * @param  array  $extra 
+     * @access public
+     * @return string
+     */
+    public function createProjectStoryLink($type, $module, $extra)
+    {
+        $projectID = $extra['projectID'];
+        $productID = $extra['productID'];
+        $linkHtml = html::a(helper::createLink('project', 'story', "root={$projectID}&orderBy=&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
+        return $linkHtml;
+    }
+
     /**
      * Create link of a doc.
      * 
@@ -1035,8 +1053,7 @@ class treeModel extends model
         {
             $linkedStories = $this->dao->select('DISTINCT t1.id,t1.version,t2.project')->from(TABLE_STORY)->alias('t1')
                 ->leftJoin(TABLE_PROJECTSTORY)->alias('t2')->on('t1.id=t2.story')
-                ->where('t1.version=t2.version')
-                ->andWhere('t1.module')->in($childIds)
+                ->where('t1.module')->in($childIds)
                 ->andWhere('t2.product')->eq($before)
                 ->fetchAll('id');
             $projects = array();
@@ -1052,8 +1069,8 @@ class treeModel extends model
                 $linkedProduct  = $this->dao->select('DISTINCT project,product')->from(TABLE_PROJECTSTORY)->where('project')->in($projects)->fetchGroup('project', 'product');
                 foreach($projects as $project)
                 {
-                    if(!isset($projectProduct[$project]) or !in_array($after, $projectProduct[$project])) $this->dao->insert(TABLE_PROJECTPRODUCT)->set('project')->eq($project)->set('product')->eq($after)->exec();
-                    if(isset($linkedProduct[$project])  and !in_array($before, $linkedProduct[$project]))
+                    if(!isset($projectProduct[$project]) or !in_array($after, array_keys($projectProduct[$project]))) $this->dao->insert(TABLE_PROJECTPRODUCT)->set('project')->eq($project)->set('product')->eq($after)->exec();
+                    if(isset($linkedProduct[$project])  and !in_array($before, array_keys($linkedProduct[$project])))
                     {
                         $this->dao->delete()->from(TABLE_PROJECTPRODUCT)->where('project')->eq($project)->andWhere('product')->eq($before)->exec();
                         $this->dao->update(TABLE_BUILD)->set('product')->eq($after)->where('product')->eq($before)->andWhere('project')->eq($project)->exec();