diff --git a/module/issue/control.php b/module/issue/control.php
index 4384512d62..56a289a94c 100644
--- a/module/issue/control.php
+++ b/module/issue/control.php
@@ -267,16 +267,18 @@ class issue extends control
     {
         if($_POST)
         {
-            $this->issue->resolve($issueID);
-            $resolution = $this->post->resolution;
+            $data = fixer::input('post')->stripTags('steps', $this->config->allowedTags)->get();
+            $resolution = $data->resolution;
+            unset($_POST['resolution'], $_POST['resolvedBy'], $_POST['resolvedDate']);
 
             $objectID = '';
             if($resolution == 'totask')
             {
-                $objectID   = $this->issue->createTask($issueID);
+                $objectID = $this->issue->createTask($issueID);
                 if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-                $objectLink = html::a($this->createLink('task', 'view', "id=$objectID"), $this->post->name, "data-toggle='modal'");
-                $comment    = sprintf($this->lang->issue->logComments[$resolution], $objectLink);
+
+                $objectLink = html::a($this->createLink('task', 'view', "id=$objectID"), $this->post->name);
+                $comment    = sprintf($this->lang->issue->logComments[$resolution], $objectLink, "data-toggle='modal'");
 
                 $this->loadModel('action')->create('task', $objectID, 'Opened', '');
                 $this->loadModel('action')->create('issue', $issueID, 'Resolved', $comment);
@@ -297,7 +299,6 @@ class issue extends control
             {
                 $objectID   = $this->issue->createBug($issueID);
                 if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-                $objectLink = html::a($this->createLink('story', 'view', "id=$objectID"), $this->post->title, "data-toggle='modal'");
                 $objectLink = html::a($this->createLink('bug', 'view', "id=$objectID"), $this->post->title, "data-toggle='modal'");
                 $comment    = sprintf($this->lang->issue->logComments[$resolution], $objectLink);
 
@@ -309,7 +310,6 @@ class issue extends control
             {
                 $objectID   = $this->issue->createRisk($issueID);
                 if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-                $objectLink = html::a($this->createLink('story', 'view', "id=$objectID"), $this->post->name, "data-toggle='modal'");
                 $objectLink = html::a($this->createLink('risk', 'view', "id=$objectID"), $this->post->name, "data-toggle='modal'");
                 $comment    = sprintf($this->lang->issue->logComments[$resolution], $objectLink);
 
@@ -317,6 +317,7 @@ class issue extends control
                 $this->loadModel('action')->create('issue', $issueID, 'Resolved', $comment);
             }
 
+            $this->issue->resolve($issueID, $data);
             if($resolution == 'resolved') $this->loadModel('action')->create('issue', $issueID, 'Resolved');
             $this->dao->update(TABLE_ISSUE)->set('objectID')->eq($objectID)->where('id')->eq($issueID)->exec();
 
@@ -375,16 +376,14 @@ class issue extends control
             $this->view->showAllModule    = 'allModule';;
             $this->view->projects         = $projects;
             $this->view->projectID        = $projectID;
-            $this->view->showFields       = $this->config->task->custom->createFields;
             $this->view->moduleID         = 0;
             $this->view->branch           = 0;
         }
 
         if(in_array($data->mode, array('tostory', 'tobug')))
         {
-            $products  = $this->loadModel('product')->getPairs();
-            $productID = $this->session->product;
-            $productID = isset($products[$productID]) ? $productID : key($products);
+            $products  = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
+            $productID = key($products);
             $branches  = $this->loadModel('branch')->getPairs($productID, 'noempty');
 
             $module = $data->mode == 'tostory' ? 'story' : 'bug';
@@ -405,23 +404,24 @@ class issue extends control
                 $members = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
                 $stories = $this->story->getProjectStoryPairs($projectID, 0, 0);
 
-                $this->view->project = $project;
-                $this->view->members = $members;
-                $this->view->stories = $stories;
+                $this->view->project    = $project;
+                $this->view->members    = $members;
+                $this->view->stories    = $stories;
+                $this->view->showFields = $this->config->task->custom->createFields;
 
                 $this->display('issue', 'taskform');
                 break;
             case 'tobug':
                 $this->loadModel('bug');
-                $this->view->builds  = $this->loadModel('build')->getProductBuildPairs($productID, '', 'noempty,noterminate,nodone');
-                $this->view->buildID = 0;
+                $this->view->builds     = $this->loadModel('build')->getProductBuildPairs($productID, '', 'noempty,noterminate,nodone');
+                $this->view->buildID    = 0;
+                $this->view->showFields = $this->config->bug->custom->createFields;
 
                 $this->display('issue', 'bugform');
                 break;
             case 'tostory':
                 $this->loadModel('story');
-                $this->view->showFields = $this->config->task->custom->createFields;
-
+                $this->fetch('story', 'replaceURLang', 'type=requirement');
                 $this->display('issue', 'storyform');
                 break;
             case 'torisk':
diff --git a/module/issue/model.php b/module/issue/model.php
index 9b68651987..9baf9255c5 100644
--- a/module/issue/model.php
+++ b/module/issue/model.php
@@ -308,13 +308,12 @@ class issueModel extends model
      * Resolve an issue.
      *
      * @param  int    $issueID
+     * @param  object $data
      * @access public
      * @return object
      */
-    public function resolve($issueID)
+    public function resolve($issueID, $data)
     {
-        $data = fixer::input('post')->stripTags('steps', $this->config->allowedTags)->get();
-
         $issue = new stdClass();
         $issue->resolution        = $data->resolution;
         $issue->resolutionComment = isset($data->resolutionComment) ? $data->resolutionComment : '';
@@ -333,15 +332,12 @@ class issueModel extends model
      */
     public function createTask()
     {
-        $task = fixer::input('post')
-            ->remove('resolution,resolvedBy,resolvedDate')
-            ->add('openedBy', $this->app->user->account)
-            ->add('openedDate', helper::today())
-            ->stripTags('desc', $this->config->allowedTags)
-            ->get();
+        $projectID = $this->post->project;
+        $tasks     = $this->loadModel('task')->create($projectID);
+        if(dao::isError()) return false;
 
-        $this->dao->insert(TABLE_TASK)->data($task)->exec();
-        return $this->dao->lastInsertID();
+        $task = current($tasks);
+        return $task['id'];
     }
 
     /**
@@ -352,25 +348,9 @@ class issueModel extends model
      */
     public function createStory()
     {
-        $story = fixer::input('post')
-            ->add('openedBy', $this->app->user->account)
-            ->add('openedDate', helper::now())
-            ->setIF($this->post->needNotReview or $this->post->product > 0, 'status', 'active')
-            ->stripTags('spec', $this->config->allowedTags)
-            ->remove('resolution,resolvedBy,resolvedDate,needNotReview')
-            ->get();
-
-        $this->dao->insert(TABLE_STORY)->data($story, 'spec')->exec();
-
-        $stotyID = $this->dao->lastInsertID();
-        $this->dao->insert(TABLE_STORYSPEC)
-            ->set('story')->eq($stotyID)
-            ->set('title')->eq($story->title)
-            ->set('spec')->eq($this->post->spec)
-            ->set('version')->eq(1)
-            ->exec();
-
-        return $stotyID;
+        $storyResult = $this->loadModel('story')->create();
+        if(dao::isError()) return false;
+        return $storyResult['id'];
     }
 
     /**
@@ -381,16 +361,9 @@ class issueModel extends model
      */
     public function createBug()
     {
-        $bug = fixer::input('post')
-            ->remove('resolution,resolvedBy,resolvedDate')
-            ->join('openedBuild', ',')
-            ->add('openedBy', $this->app->user->account)
-            ->add('openedDate', helper::now())
-            ->stripTags('steps', $this->config->allowedTags)
-            ->get();
-
-        $this->dao->insert(TABLE_BUG)->data($bug)->exec();
-        return $this->dao->lastInsertID();
+        $bugResult = $this->loadModel('bug')->create();
+        if(dao::isError()) return false;
+        return $bugResult['id'];
     }
 
     /**
@@ -401,14 +374,9 @@ class issueModel extends model
      */
     public function createRisk()
     {
-        $risk = fixer::input('post')
-            ->add('createdBy', $this->app->user->account)
-            ->add('createdDate', helper::now())
-            ->remove('resolution,resolvedBy,resolvedDate')
-            ->get();
-
-        $this->dao->insert(TABLE_RISK)->data($risk)->exec();
-        return $this->dao->lastInsertID();
+        $riskID = $this->loadModel('risk')->create();
+        if(dao::isError()) return false;
+        return $riskID;
     }
 
    /**
diff --git a/module/issue/view/bugform.html.php b/module/issue/view/bugform.html.php
index 3a21c63acf..848d9da0c5 100644
--- a/module/issue/view/bugform.html.php
+++ b/module/issue/view/bugform.html.php
@@ -43,11 +43,8 @@
     </div>
   </td>
 </tr>
-<?php $showProject = (strpos(",$showFields,", ',project,') !== false);?>
 <tr>
-  <th><?php echo ($showProject) ? $lang->bug->project : $lang->bug->type;?></th>
-
-  <?php if(!$showProject):?>
+  <th><?php echo $lang->bug->type;?></th>
   <?php $showOS      = strpos(",$showFields,", ',os,')      !== false;?>
   <?php $showBrowser = strpos(",$showFields,", ',browser,') !== false;?>
   <td>
@@ -55,20 +52,20 @@
       <?php echo html::select('type', $lang->bug->typeList, '', "class='form-control'");?>
       <?php if($showOS):?>
       <span class='input-group-addon fix-border'><?php echo $lang->bug->os?></span>
-      <?php echo html::select('os', $lang->bug->osList, $os, "class='form-control'");?>
+      <?php echo html::select('os', $lang->bug->osList, '', "class='form-control w-120px'");?>
       <?php endif;?>
       <?php if($showBrowser):?>
       <span class='input-group-addon fix-border'><?php echo $lang->bug->browser?></span>
-      <?php echo html::select('browser', $lang->bug->browserList, $browser, "class='form-control'");?>
+      <?php echo html::select('browser', $lang->bug->browserList, '', "class='form-control w-100px'");?>
       <?php endif;?>
     </div>
   </td>
-  <?php endif;?>
-  <?php if($showProject):?>
+</tr>
+<tr>
+  <th><?php echo $lang->bug->project;?></th>
   <td><span id='projectIdBox'><?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?></span></td>
-  <?php endif;?>
   <td>
-    <div class='input-group' id='buildBox'>
+    <div class='input-group required' id='buildBox'>
       <span class="input-group-addon"><?php echo $lang->bug->openedBuild?></span>
       <?php echo html::select('openedBuild[]', $builds, $buildID, "size=4 multiple=multiple class='chosen form-control'");?>
       <span class='input-group-addon fix-border' id='buildBoxActions'></span>
@@ -94,40 +91,10 @@
   </td>
 </tr>
 <?php endif;?>
-<?php if($showProject):?>
-<?php $showOS      = strpos(",$showFields,", ',os,')      !== false;?>
-<?php $showBrowser = strpos(",$showFields,", ',browser,') !== false;?>
-<tr>
-  <th><?php echo $lang->bug->type;?></th>
-  <td>
-    <div class='table-row'>
-      <div class='table-col' id='typeBox'>
-        <?php echo html::select('type', $lang->bug->typeList, $type, "class='form-control chosen'");?>
-      </div>
-      <?php if($showOS):?>
-      <div class='table-col' id='osBox'>
-        <div class='input-group'>
-          <span class='input-group-addon fix-border'><?php echo $lang->bug->os?></span>
-          <?php echo html::select('os', $lang->bug->osList, $os, "class='form-control chosen'");?>
-        </div>
-      </div>
-      <?php endif;?>
-      <?php if($showBrowser):?>
-      <div class='table-col'>
-        <div class='input-group'>
-          <span class='input-group-addon fix-border'><?php echo $lang->bug->browser?></span>
-          <?php echo html::select('browser', $lang->bug->browserList, $browser, "class='form-control chosen'");?>
-        </div>
-      </div>
-      <?php endif;?>
-    </div>
-  </td>
-</tr>
-<?php endif;?>
 <tr>
   <th><?php echo $lang->bug->title;?></th>
   <td colspan='2'>
-    <div class="input-group title-group">
+    <div class="input-group title-group required">
       <div class="input-control has-icon-right">
         <?php echo html::input('title', $issue->title, "class='form-control'");?>
       </div>
@@ -166,10 +133,6 @@
   </td>
 </tr>
 <?php
-$showMailto   = strpos(",$showFields,", ',mailto,')   !== false;
-$showKeywords = strpos(",$showFields,", ',keywords,') !== false;
-?>
-<?php
 js::set('holders', $lang->bug->placeholder);
 js::set('page', 'create');
 js::set('createRelease', $lang->release->create);
diff --git a/module/issue/view/storyform.html.php b/module/issue/view/storyform.html.php
index ba2003168b..45fb0371d1 100644
--- a/module/issue/view/storyform.html.php
+++ b/module/issue/view/storyform.html.php
@@ -59,11 +59,11 @@
   <th><?php echo $lang->story->title;?></th>
   <td colspan="2">
     <div class="input-group title-group">
-      <div class="input-control has-icon-right">
+      <div class="input-control has-icon-right required">
         <?php echo html::input('title', $issue->title, "class='form-control'");?>
       </div>
       <span class="input-group-addon fix-border br-0"><?php echo $lang->story->pri;?></span>
-      <div class="input-group-btn pri-selector" data-type="pri">
+      <div class="input-group-btn pri-selector w-80px" data-type="pri">
         <?php echo html::select('pri', $lang->story->priList, $issue->pri, "class='form-control'");?>
       </div>
       <div class='table-col w-120px'>
@@ -105,6 +105,7 @@
 <tr>
   <td></td>
   <td>
+    <?php echo html::hidden('type', 'requirement');?>
     <div class='form-action'><?php echo html::submitButton();?></div>
   </td>
 </tr>
diff --git a/module/issue/view/taskform.html.php b/module/issue/view/taskform.html.php
index 562a4d098f..9434029e75 100644
--- a/module/issue/view/taskform.html.php
+++ b/module/issue/view/taskform.html.php
@@ -18,11 +18,11 @@
 </tr>
 <tr>
   <th><?php echo $lang->task->project;?></th>
-  <td><?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadAll(this.value)'");?></td><td></td><td></td>
+  <td class="required"><?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadAll(this.value)'");?></td><td></td><td></td>
 </tr>
 <tr>
   <th><?php echo $lang->task->type;?></th>
-  <td><?php echo html::select('type', $lang->task->typeList, $task->type, "class='form-control chosen'");?></td>
+  <td class="required"><?php echo html::select('type', $lang->task->typeList, $task->type, "class='form-control chosen'");?></td>
   <td>
   </td>
 </tr>
@@ -40,7 +40,7 @@
   <th><?php echo $lang->task->assignedTo;?></th>
   <td>
     <div class="input-group" id="dataPlanGroup">
-      <?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?>
+      <?php echo html::select('assignedTo[]', $members, $task->assignedTo, "class='form-control chosen'");?>
       <span class="input-group-btn team-group hidden"><a class="btn br-0" href="#modalTeam" data-toggle="modal"><?php echo $lang->task->team;?></a></span>
     </div>
   </td>
@@ -49,7 +49,7 @@
   <th><?php echo $lang->task->name;?></th>
   <td colspan='3'>
     <div class="input-group title-group">
-      <div class="input-control has-icon-right">
+      <div class="input-control has-icon-right required">
         <?php echo html::input('name', $task->name, "class='form-control'");?>
       </div>
       <span class="input-group-addon fix-border br-0"><?php echo $lang->task->pri;?></span>
@@ -79,13 +79,15 @@ $hiddenDeadline   = strpos(",$showFields,", ',deadline,')   === false;
 <tr>
   <th><?php echo $lang->task->datePlan;?></th>
   <td colspan='2'>
-    <div class='input-group'>
+    <div class='input-group required'>
       <?php if(!$hiddenEstStarted):?>
       <?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date' placeholder='{$lang->task->estStarted}'");?>
       <?php endif;?>
+
       <?php if(!$hiddenEstStarted and !$hiddenDeadline):?>
       <span class='input-group-addon fix-border'>~</span>
       <?php endif;?>
+
       <?php if(!$hiddenDeadline):?>
       <?php echo html::input('deadline', $task->deadline, "class='form-control form-date' placeholder='{$lang->task->deadline}'");?>
       <?php endif;?>
diff --git a/module/task/model.php b/module/task/model.php
index 125266e7d6..58cea6e334 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -28,6 +28,9 @@ class taskModel extends model
             return false;
         }
 
+        $program = $this->loadModel('project')->getByID($this->session->PRJ);
+        if($program->model == 'waterfall') $this->config->task->create->requiredFields .= ',estStarted,deadline';
+
         $projectID      = (int)$projectID;
         $taskIdList     = array();
         $taskFiles      = array();