diff --git a/framework/control.class.php b/framework/control.class.php
index b98973b91f..d7fd0ec2ee 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -185,16 +185,21 @@ class control extends baseControl
     /**
      * Print extend fields.
      *
-     * @param  object $object    bug | build | feedback | product | productplan | project | release | story | task | testcase | testsuite | testtask
-     * @param  string $type      table | div
-     * @param  string $extras    columns=1,mode=value,position=right|right|all
+     * @param  object $object   bug | build | feedback | product | productplan | project | release | story | task | testcase | testsuite | testtask
+     * @param  string $type     The parent component which fileds displayed in. It should be table or div.
+     * @param  string $extras   The extra params.
+     *                          columns=2|3|5           Number of the columns merged to display the fields. The default is 1.
+     *                          position=left|right     The position which the fields displayed in a page.
+     *                          inForm=0|1              The fields displayed in a form or not. The default is 1.
+     *                          inCell=0|1              The fields displayed in a div with class cell or not. The default is 0.
      * @access public
      * @return void
      */
-    public function printExtendFields($object, $type, $extras)
+    public function printExtendFields($object, $type, $extras = '')
     {
         if(!isset($this->config->bizVersion)) return false;
-        $this->loadModel('flow')->printFields($this->moduleName, $this->methodName, $object, $type, $extras);
+
+        echo $this->loadModel('flow')->printFields($this->moduleName, $this->methodName, $object, $type, $extras);
     }
 
     /**
diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index d3af8dcb37..55f7eda56e 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -34,7 +34,7 @@
           <th><?php echo $lang->bug->status;?></th>
           <td><?php echo html::hidden('status', 'active');?></td>
         </tr>
-        <?php $this->printExtendFields($bug, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($bug, 'table');?>
         <tr>
           <th><?php echo $lang->bug->openedBuild;?></th>
           <td colspan='2'><?php echo html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?></td>
diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index 3953004a00..454c943aad 100644
--- a/module/bug/view/assignto.html.php
+++ b/module/bug/view/assignto.html.php
@@ -38,7 +38,7 @@ js::set('page', 'assignedto');
           <th><?php echo $lang->bug->status;?></th>
           <td><?php echo html::hidden('status', $bug->status);?></td>
         </tr>
-        <?php $this->printExtendFields($bug, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($bug, 'table');?>
         <tr>
           <th><?php echo $lang->bug->mailto;?></th>
           <td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php
index 6ceb3f22a4..6d2f80c941 100644
--- a/module/bug/view/close.html.php
+++ b/module/bug/view/close.html.php
@@ -30,7 +30,7 @@
           <th class='w-60px'><?php echo $lang->bug->status;?></th>
           <td><?php echo html::hidden('status', 'closed');?></td>
         </tr>
-        <?php $this->printExtendFields($bug, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($bug, 'table');?>
         <tr>
           <th class='w-60px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php
index e9b31fca17..3d54a18561 100755
--- a/module/bug/view/confirmbug.html.php
+++ b/module/bug/view/confirmbug.html.php
@@ -50,7 +50,7 @@ js::set('page', 'confirmbug');
           <td><?php echo html::hidden('status', $bug->status);?></td>
           <td></td>
         </tr>
-        <?php $this->printExtendFields($bug, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($bug, 'table');?>
         <tr>
           <th><?php echo $lang->bug->mailto;?></th>
           <td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 1ab8b9d20e..5d8ec4dc24 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -292,7 +292,7 @@ js::set('flow', $config->global->flow);
             <th><?php echo $lang->bug->status;?></th>
             <td><?php echo html::hidden('status');?></td>
           </tr>
-          <?php $this->printExtendFields('', 'table', 'columns=1');?>
+          <?php $this->printExtendFields('', 'table');?>
           <tr>
             <th><?php echo $lang->bug->files;?></th>
             <td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=1&percent=0.85');?></td>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 93e71d744d..a762c9b334 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -62,7 +62,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
               <?php echo html::textarea('comment', '', "rows='5' class='form-control kindeditor' hidefocus='true'");?>
             </div>
           </div>
-          <?php $this->printExtendFields($bug, 'div', 'position=left&divCell=false');?>
+          <?php $this->printExtendFields($bug, 'div', 'position=left');?>
           <div class="detail">
             <div class="detail-title"><?php echo $lang->files;?></div>
             <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
@@ -297,7 +297,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
               </tbody>
             </table>
           </div>
-          <?php $this->printExtendFields($bug, 'div', 'position=right&divCell=false');?>
+          <?php $this->printExtendFields($bug, 'div', 'position=right');?>
         </div>
       </div>
     </div>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index f2c2523579..d7a7b9f6d1 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -77,7 +77,7 @@ js::set('productID' , $bug->product);
           <th><?php echo $lang->bug->status;?></th>
           <td><?php echo html::hidden('status', 'resolved');?></td>
         </tr>
-        <?php $this->printExtendFields($bug, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($bug, 'table');?>
         <tr>
           <th><?php echo $lang->bug->files;?></th>
           <td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=1&percent=0.85');?></td>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 1794eefb73..4cc4131aca 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -58,7 +58,7 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true'));?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=bug&objectID=$bug->id");?>
     </div>
-    <?php $this->printExtendFields($bug, 'div', "position=left&divCell=true");?>
+    <?php $this->printExtendFields($bug, 'div', "position=left&inForm=0&inCell=1");?>
     <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <?php
     $params        = "bugID=$bug->id";
@@ -376,7 +376,7 @@
         </div>
       </div>
     </div>
-    <?php $this->printExtendFields($bug, 'div', "position=right&mode=value");?>
+    <?php $this->printExtendFields($bug, 'div', "position=right&inForm=0&inCell=1");?>
   </div>
 </div>
 
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index f968eadafd..94be631064 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -335,7 +335,7 @@ tbody tr td:first-child input{display:none;}
                   <th><?php echo $lang->build->filePath;?></th>
                   <td style='word-break:break-all;'><?php echo html::a($build->filePath, $build->filePath, '_blank');?></td>
                 </tr>
-                <?php $this->printExtendFields($build, 'table', "position=all&columns=1");?>
+                <?php $this->printExtendFields($build, 'table', 'inForm=0');?>
                 <?php if($config->global->flow != 'onlyTest'):?>
                 <tr>
                   <th style="vertical-align:top"><?php echo $lang->build->desc;?></th>
diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php
index b4e12dbe32..e6ec6e5039 100644
--- a/module/product/view/close.html.php
+++ b/module/product/view/close.html.php
@@ -28,7 +28,7 @@
         <th class='w-40px'><?php echo $lang->product->status;?></th>
         <td><?php echo html::hidden('status', $product->status);?></td>
       </tr>
-      <?php $this->printExtendFields($product, 'table', 'columns=1');?>
+      <?php $this->printExtendFields($product, 'table');?>
       <tr>
         <th class='w-40px'><?php echo $lang->comment;?></th>
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index b089804aec..62cfba66a0 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -66,7 +66,7 @@
             <td><?php echo html::hidden('status', 'normal');?></td>
             <td></td>
           </tr>
-          <?php $this->printExtendFields('', 'table', 'columns=1');?>
+          <?php $this->printExtendFields('', 'table');?>
           <tr>
             <th><?php echo $lang->product->desc;?></th>
             <td colspan='2'>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 572d8b9935..c01aae8c75 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -58,7 +58,7 @@
             <th><?php echo $lang->product->status;?></th>
             <td><?php echo html::select('status', $lang->product->statusList, $product->status, "class='form-control'");?></td><td></td>
           </tr>  
-          <?php $this->printExtendFields($product, 'table', 'columns=1');?>
+          <?php $this->printExtendFields($product, 'table');?>
           <tr>
             <th><?php echo $lang->product->desc;?></th>
             <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($product->desc), "rows='8' class='form-control'");?></td>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 7f3dba8890..319ec4d2aa 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -75,7 +75,7 @@
           </div>
         </div>
       </div>
-      <?php $this->printExtendFields($product, 'div', "position=left&divCell=false");?>
+      <?php $this->printExtendFields($product, 'div', "position=left&inForm=0");?>
       <div class="col-sm-12">
         <?php $blockHistory = true;?>
         <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=product&objectID=$product->id");?>
@@ -236,7 +236,7 @@
             </div>
           </div>
           <?php endif;?>
-          <?php $this->printExtendFields($product, 'div', "position=right&mode=value");?>
+          <?php $this->printExtendFields($product, 'div', "position=right&inForm=0&inCell=1");?>
         </div>
       </div>
     </div>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 3a22833ff6..7f408d399b 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -52,7 +52,7 @@
             <td><?php echo html::input('end', $plan->end != '2030-01-01' ? formatTime($plan->end) : '', 'class="form-control form-date"');?></td>
             <td colspan='2'><?php echo html::radio('delta', $lang->productplan->endList , '', "onclick='computeEndDate(this.value)'");?></td>
           </tr>
-          <?php $this->printExtendFields($plan, 'table', 'columns=1');?>
+          <?php $this->printExtendFields($plan, 'table');?>
           <tr>
             <th><?php echo $lang->productplan->desc;?></th>
             <td colspan='3'><?php echo html::textarea('desc', htmlspecialchars($plan->desc), "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 8bc2effef1..e6e996e2a6 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -455,7 +455,7 @@
                   </td>
                 </tr>
                 <?php endif;?>
-                <?php $this->printExtendFields($plan, 'table', "position=all&columns=1");?>
+                <?php $this->printExtendFields($plan, 'table', 'inForm=0');?>
                 <tr>
                   <th><?php echo $lang->productplan->desc;?></th>
                   <td><?php echo $plan->desc;?></td>
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php
index 984bd88366..7ef24518a1 100644
--- a/module/project/view/close.html.php
+++ b/module/project/view/close.html.php
@@ -29,7 +29,7 @@
           <th class='w-50px'><?php echo $lang->project->status;?></th>
           <td><?php echo html::hidden('status', 'closed');?></td>
         </tr>
-        <?php $this->printExtendFields($project, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($project, 'table');?>
         <tr>
           <th class='w-50px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 0eea960508..fa4d4959d7 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -88,7 +88,7 @@
           <td></td>
           <td></td>
         </tr>
-        <?php $this->printExtendFields('', 'table', 'columns=1');?>
+        <?php $this->printExtendFields('', 'table');?>
         <tr <?php if($config->global->flow == 'onlyTask') echo "class='hidden'";?>>
           <th><?php echo $lang->project->manageProducts;?></th>
           <td class='text-left' id='productsBox' colspan="3">
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index feaa6acb5b..6f89eba8ba 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -150,7 +150,7 @@
           <th><?php echo $lang->project->desc;?></th>
           <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($project->desc), "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
-        <?php $this->printExtendFields($project, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($project, 'table');?>
         <tr>
           <th><?php echo $lang->project->acl;?></th>
           <td colspan='2'><?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?></td>
diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php
index 89ef1020c8..13a6ab7401 100644
--- a/module/project/view/suspend.html.php
+++ b/module/project/view/suspend.html.php
@@ -28,7 +28,7 @@
         <th><?php echo $lang->project->status;?></th>
         <td><?php echo html::hidden('status', 'suspended');?></td>
       </tr>
-      <?php $this->printExtendFields($project, 'table', 'columns=1');?>
+      <?php $this->printExtendFields($project, 'table');?>
       <tr>
         <th class='w-50px'><?php echo $lang->comment;?></th>
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index d61c02ba17..44e0b3f98a 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -140,7 +140,7 @@
             </div>
           </div>
         </div>
-        <?php $this->printExtendFields($project, 'div', "position=left&divCell=false");?>
+        <?php $this->printExtendFields($project, 'div', "position=left&inForm=0");?>
         <div class="col-sm-12">
           <?php $blockHistory = true;?>
           <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=project&objectID=$project->id");?>
@@ -295,7 +295,7 @@
                 <?php endif;?>
               </div>
             </div>
-            <?php $this->printExtendFields($project, 'div', "position=right&mode=value");?>
+            <?php $this->printExtendFields($project, 'div', "position=right&inForm=0&inCell=1");?>
           </div>
         </div>
       </div>
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index 115262cf60..2c134b8375 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -44,7 +44,7 @@
             <td><?php echo html::hidden('status', 'normal', "disabled");?></td>
             <td></td>
           </tr>
-          <?php $this->printExtendFields('', 'table', 'columns=1');?>
+          <?php $this->printExtendFields('', 'table');?>
           <tr>
             <th><?php echo $lang->release->desc;?></th>
             <td colspan='2'><?php echo html::textarea('desc', '', "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index d35affc5ed..bf94003bc4 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -47,7 +47,7 @@
             <th><?php echo $lang->release->status;?></th>
             <td><?php echo html::select('status', $lang->release->statusList, $release->status, "class='form-control'");?></td><td></td>
           </tr>  
-          <?php $this->printExtendFields($release, 'table', 'columns=1');?>
+          <?php $this->printExtendFields($release, 'table');?>
           <tr>
             <th><?php echo $lang->release->desc;?></th>
             <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($release->desc), "rows=10 class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 0b295c42c9..dc10c7be81 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -330,7 +330,7 @@
                       <th><?php echo $lang->release->date;?></th>
                       <td><?php echo $release->date;?></td>
                     </tr>
-                    <?php $this->printExtendFields($release, 'table', "position=all&columns=1");?>
+                    <?php $this->printExtendFields($release, 'table', 'inForm=0');?>
                     <tr>
                       <th><?php echo $lang->release->desc;?></th>
                       <td><?php echo $release->desc;?></td>
diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php
index aacb0bb91d..c946a90973 100644
--- a/module/story/view/activate.html.php
+++ b/module/story/view/activate.html.php
@@ -38,7 +38,7 @@
             ?>
           </td>
         </tr>
-        <?php $this->printExtendFields($story, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($story, 'table');?>
         <tr>
           <th><?php echo $lang->story->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', 'rows=5 class="area-1"');?></td>
diff --git a/module/story/view/assignto.html.php b/module/story/view/assignto.html.php
index ba8cc09ff1..a523af0712 100644
--- a/module/story/view/assignto.html.php
+++ b/module/story/view/assignto.html.php
@@ -33,7 +33,7 @@
           <th><?php echo $lang->story->status;?></th>
           <td><?php echo html::hidden('status', $story->status);?></td>
         </tr>
-        <?php $this->printExtendFields($story, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($story, 'table');?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index a828a4d006..43c0000a9b 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -40,7 +40,7 @@
           <th><?php echo $lang->story->status;?></th>
           <td><?php echo html::hidden('status', $story->status);?></td>
         </tr>
-        <?php $this->printExtendFields($story, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($story, 'table');?>
         <tr>
           <th><?php echo $lang->story->title;?></th>
           <td colspan='2'><?php echo html::input('title', $story->title, 'class="form-control"');?></td>
diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php
index 872d185444..31a27df0f9 100644
--- a/module/story/view/close.html.php
+++ b/module/story/view/close.html.php
@@ -40,7 +40,7 @@
           <th><?php echo $lang->story->status;?></th>
           <td><?php echo html::hidden('status', 'closed');?></td>
         </tr>
-        <?php $this->printExtendFields($story, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($story, 'table');?>
         <tr>
           <th><?php echo $lang->story->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='8' class='form-control'");?></td>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index a630dbaf74..b217129d2b 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -177,7 +177,7 @@
             <th><?php echo $lang->story->status;?></th>
             <td><?php echo html::hidden('status', 'draft');?></td>
           </tr>
-          <?php $this->printExtendFields('', 'table', 'columns=1');?>
+          <?php $this->printExtendFields('', 'table');?>
           <tr>
             <th><?php echo $lang->story->legendAttatch;?></th>
             <td colspan='4'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 7b29c31993..0a1970af89 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -43,7 +43,7 @@
             <div class='detail-title'><?php echo $lang->story->verify;?></div>
             <div class='detail-content article-content'><?php echo $story->verify;?></div>
           </div>
-          <?php $this->printExtendFields($story, 'div', 'position=left&divCell=false');?>
+          <?php $this->printExtendFields($story, 'div', 'position=left');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->story->comment;?></div>
             <div class='form-group'>
@@ -200,7 +200,7 @@
             </table>
           </div>
     
-          <?php $this->printExtendFields($story, 'div', 'position=right&divCell=false');?>
+          <?php $this->printExtendFields($story, 'div', 'position=right');?>
 
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->story->legendMisc;?></div>
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php
index fa3703d339..197d5f1fb8 100644
--- a/module/story/view/review.html.php
+++ b/module/story/view/review.html.php
@@ -68,7 +68,7 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
           <th><?php echo $lang->story->status;?></th>
           <td><?php echo html::hidden('status', $story->status);?></td>
         </tr>
-        <?php $this->printExtendFields($story, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($story, 'table');?>
         <tr>
           <th><?php echo $lang->story->reviewedBy;?></th>
           <td colspan='2'><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control' multiple data-placeholder='{$lang->story->chosen->reviewedBy}'");?></td>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index eb9982657b..d713176357 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -62,7 +62,7 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $story->files, 'fieldset' => 'true'));?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=story&objectID=$story->id");?>
     </div>
-    <?php $this->printExtendFields($story, 'div', "position=left&divCell=true");?>
+    <?php $this->printExtendFields($story, 'div', "position=left&inForm=0&inCell=1");?>
     <div class="cell"><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
@@ -387,7 +387,7 @@
         </div>
       </div>
     </div>
-    <?php $this->printExtendFields($story, 'div', "position=right&mode=value");?>
+    <?php $this->printExtendFields($story, 'div', "position=right&inForm=0&inCell=1");?>
   </div>
 </div>
 
diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php
index d13a720294..ad9ea44b5a 100644
--- a/module/task/view/cancel.html.php
+++ b/module/task/view/cancel.html.php
@@ -30,7 +30,7 @@
           <th><?php echo $lang->task->status;?></th>
           <td><?php echo html::hidden('status', 'cancel');?></td>
         </tr>
-        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table');?>
         <tr>
           <th class='w-50px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php
index 8031ccfa13..7002c5007c 100644
--- a/module/task/view/close.html.php
+++ b/module/task/view/close.html.php
@@ -30,7 +30,7 @@
           <th><?php echo $lang->task->status;?></th>
           <td><?php echo html::hidden('status', 'closed');?></td>
         </tr>
-        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table');?>
         <tr>
           <th class='w-50px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index fda31fb51f..483083576b 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -63,7 +63,7 @@
           <th><?php echo $lang->task->status;?></th>
           <td><?php echo html::hidden('status', 'wait');?></td>
         </tr>
-        <?php $this->printExtendFields('', 'table', 'columns=1');?>
+        <?php $this->printExtendFields('', 'table');?>
         <?php if(strpos(",$showFields,", ',story,') !== false and $config->global->flow != 'onlyTask' and $project->type != 'ops'):?>
         <tr>
           <th><?php echo $lang->task->story;?></th>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index d3d786e9d2..dddada366d 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -69,7 +69,7 @@
             <div class='detail-title'><?php echo $lang->comment;?></div>
             <div class='detail-content'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></div>
           </div>
-          <?php $this->printExtendFields($task, 'div', 'position=left&divCell=false');?>
+          <?php $this->printExtendFields($task, 'div', 'position=left');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->files;?></div>
             <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
@@ -215,7 +215,7 @@
               </tr>
             </table>
           </div>
-          <?php $this->printExtendFields($task, 'div', 'position=right&divCell=false');?>
+          <?php $this->printExtendFields($task, 'div', 'position=right');?>
         </div>
       </div>
     </div>
@@ -274,7 +274,6 @@
             </tfoot>
           </table>
         </div>
-        <?php $this->printExtendFields($task, 'div', 'position=left&divCell=false');?>
       </div>
     </div>
   </form>
diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php
index 6f1af85d72..e580f43c86 100644
--- a/module/task/view/pause.html.php
+++ b/module/task/view/pause.html.php
@@ -38,7 +38,7 @@
           <th><?php echo $lang->task->status;?></th>
           <td><?php echo html::hidden('status', 'pause');?></td>
         </tr>
-        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table');?>
         <tr>
           <th class='w-60px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 7c2ad104c9..3dc8f82f5d 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -145,7 +145,7 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=task&objectID=$task->id");?>
     </div>
-    <?php $this->printExtendFields($task, 'div', "position=left&divCell=true");?>
+    <?php $this->printExtendFields($task, 'div', "position=left&inForm=0&inCell=1");?>
     <div class="cell"><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
@@ -376,7 +376,7 @@
         </div>
       </details>
     </div>
-    <?php $this->printExtendFields($task, 'div', "position=right&mode=value");?>
+    <?php $this->printExtendFields($task, 'div', "position=right&inForm=0&inCell=1");?>
   </div>
 </div>
 
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index fd99d6d02d..1971328be4 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -210,7 +210,7 @@
           <th><?php echo $lang->testcase->status;?></th>
           <td><?php echo html::hidden('status', 'normal');?></td>
         </tr>
-        <?php $this->printExtendFields('', 'table', 'columns=1');?>
+        <?php $this->printExtendFields('', 'table');?>
         <tr>
           <th><?php echo $lang->testcase->files;?></th>
           <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index f43d592c4a..943f2db84e 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -114,7 +114,7 @@
               </table>
             </div>
           </div>
-          <?php $this->printExtendFields($case, 'div', 'position=left&divCell=false');?>
+          <?php $this->printExtendFields($case, 'div', 'position=left');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->testcase->legendComment;?></div>
             <div class='detail-content'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></div>
@@ -248,7 +248,7 @@
               <?php endif;?>
             </table>
           </div>
-          <?php $this->printExtendFields($case, 'div', 'position=right&divCell=false');?>
+          <?php $this->printExtendFields($case, 'div', 'position=right');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->testcase->legendOpenAndEdit;?></div>
             <table class='table table-form'>
diff --git a/module/testcase/view/review.html.php b/module/testcase/view/review.html.php
index 2f037d5cb1..5fe8d599a7 100644
--- a/module/testcase/view/review.html.php
+++ b/module/testcase/view/review.html.php
@@ -36,7 +36,7 @@
         <th><?php echo $lang->testcase->status;?></th>
         <td><?php echo html::hidden('status', $case->status);?></td>
       </tr>
-      <?php $this->printExtendFields($case, 'table', 'columns=1');?> 
+      <?php $this->printExtendFields($case, 'table');?>
       <tr>
         <th><?php echo $lang->testcase->reviewedByAB;?></th>
         <td colspan='2'><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control chosen' multiple");?></td>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index d74247c4cb..1b110cbcb9 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -96,7 +96,7 @@
       </div>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
     </div>
-    <?php $this->printExtendFields($case, 'div', "position=left&divCell=true");?>
+    <?php $this->printExtendFields($case, 'div', "position=left&inForm=0&inCell=1");?>
     <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
@@ -327,7 +327,7 @@
         </div>
       </details>
     </div>
-    <?php $this->printExtendFields($case, 'div', "position=right&divCell=true");?>
+    <?php $this->printExtendFields($case, 'div', "position=right&inForm=0&inCell=1");?>
   </div>
 </div>
 <div id="mainActions" class='main-actions'>
diff --git a/module/testsuite/view/edit.html.php b/module/testsuite/view/edit.html.php
index b6688bd2c6..807ea8c7c5 100644
--- a/module/testsuite/view/edit.html.php
+++ b/module/testsuite/view/edit.html.php
@@ -27,7 +27,7 @@
           <th><?php echo $lang->testsuite->desc;?></th>
           <td><?php echo html::textarea('desc', htmlspecialchars($suite->desc), "rows=10 class='form-control'");?></td>
         </tr>
-        <?php $this->printExtendFields($suite, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($suite, 'table');?>
         <?php if($suite->type != 'library'):?>
         <tr>
           <th><?php echo $lang->testsuite->author;?></th>
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index 7b150a4e8f..ee6da9488a 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -153,7 +153,7 @@
         </div>
       </div>
     </div>
-    <?php $this->printExtendFields($suite, 'div', "position=right&divCell=true");?>
+    <?php $this->printExtendFields($suite, 'div', "position=right&inForm=0&inCell=1");?>
     <div class='cell'>
       <?php include '../../common/view/action.html.php';?>
     </div>
diff --git a/module/testtask/view/activate.html.php b/module/testtask/view/activate.html.php
index 958cb7c25a..68f38ff3cf 100644
--- a/module/testtask/view/activate.html.php
+++ b/module/testtask/view/activate.html.php
@@ -27,7 +27,7 @@
           <th class='w-45px'><?php echo $lang->testtask->status;?></th>
           <td><?php echo html::hidden('status', 'doing');?></td>
         </tr>
-        <?php $this->printExtendFields($testtask, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($testtask, 'table');?>
         <tr>
           <th class='w-45px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/testtask/view/block.html.php b/module/testtask/view/block.html.php
index 05301610cf..9d8d88385b 100644
--- a/module/testtask/view/block.html.php
+++ b/module/testtask/view/block.html.php
@@ -28,7 +28,7 @@
           <th class='w-45px'><?php echo $lang->testtask->status;?></th>
           <td><?php echo html::hidden('status', 'blocked');?></td>
         </tr>
-        <?php $this->printExtendFields($testtask, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($testtask, 'table');?>
         <tr>
           <th class='w-45px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/testtask/view/close.html.php b/module/testtask/view/close.html.php
index aa42a83333..c789730286 100644
--- a/module/testtask/view/close.html.php
+++ b/module/testtask/view/close.html.php
@@ -27,7 +27,7 @@
           <th class='w-60px'><?php echo $lang->testtask->status;?></th>
           <td><?php echo html::hidden('status', 'done');?></td>
         </tr>
-        <?php $this->printExtendFields($testtask, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($testtask, 'table');?>
         <tr>
           <th class='w-60px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index a82c0ede2d..5fa2bc65ac 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -94,7 +94,7 @@
             </div>
           </td>
         </tr>
-        <?php $this->printExtendFields('', 'table', 'columns=1');?>
+        <?php $this->printExtendFields('', 'table');?>
         <tr>
           <td class='text-center form-actions' colspan='3'>
             <?php echo html::submitButton();?>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index d920c5bc30..c93241f3fd 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -83,7 +83,7 @@
             </div>
           </td>
         </tr>
-        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table');?>
         <tr>
           <td class='text-center form-actions' colspan='3'>
             <?php echo html::submitButton();?>
diff --git a/module/testtask/view/start.html.php b/module/testtask/view/start.html.php
index f43b5dc55f..fe9cf19be8 100644
--- a/module/testtask/view/start.html.php
+++ b/module/testtask/view/start.html.php
@@ -29,7 +29,7 @@
           <th class='w-45px'><?php echo $lang->testtask->status;?></th>
           <td><?php echo html::hidden('status', 'doing');?></td>
         </tr>
-        <?php $this->printExtendFields($testtask, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($testtask, 'table');?>
         <tr>
           <th class='w-45px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index ab463683da..1bec08eeec 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -41,7 +41,7 @@
       <?php endif;?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=testtask&objectID=$task->id");?>
     </div>
-    <?php $this->printExtendFields($task, 'div', "position=left&divCell=true");?>
+    <?php $this->printExtendFields($task, 'div', "position=left&inForm=0&inCell=1");?>
     <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
@@ -124,7 +124,7 @@
         </div>
       </div>
     </div>
-    <?php $this->printExtendFields($task, 'div', "position=right&mode=value");?>
+    <?php $this->printExtendFields($task, 'div', "position=right&inForm=0&inCell=1");?>
   </div>
 </div>