diff --git a/module/project/css/manageproducts.css b/module/project/css/manageproducts.css
new file mode 100644
index 0000000000..03d69f8a8e
--- /dev/null
+++ b/module/project/css/manageproducts.css
@@ -0,0 +1 @@
+span{display:block; float:left; width:200px}
diff --git a/module/project/js/common.js b/module/project/js/common.js
new file mode 100644
index 0000000000..1a6080069c
--- /dev/null
+++ b/module/project/js/common.js
@@ -0,0 +1,9 @@
+function setWhite(acl)
+{
+    acl == 'custom' ? $('#whitelistBox').removeClass('hidden') : $('#whitelistBox').addClass('hidden');
+}
+function switchGroup(projectID, groupBy)
+{
+    link = createLink('project', 'groupTask', 'project=' + projectID + '&groupBy=' + groupBy);
+    location.href=link;
+}
diff --git a/module/project/js/story.js b/module/project/js/story.js
new file mode 100644
index 0000000000..bf4d0687b5
--- /dev/null
+++ b/module/project/js/story.js
@@ -0,0 +1,4 @@
+$(document).ready(function()
+{
+    $("a.iframe").colorbox({width:640, height:480, iframe:true, transition:'none'});
+});
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index d3f58ddbae..9fc4e7611b 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -12,49 +12,47 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
-<div class='yui-d0'>
-  <table class='table-1 fixed colored tablesorter'>
-    <caption class='caption-tl'>
-      <div class='f-left'><?php echo $lang->project->bug;?></div>
-      <div class='f-right'><?php common::printLink('bug', 'create', "productID=$productID&extra=projectID=$project->id", $lang->bug->create);?></div>
-    </caption>
-    <thead>
-    <tr class='colhead'>
-      <?php $vars = "projectID={$project->id}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
-      <th class='w-id'>      <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
-      <th class='w-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
-      <th class='w-pri'>     <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
-      <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
-      <th class='w-user'><?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
-      <th class='w-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-      <th class='w-user'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
-      <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
-      <th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php foreach($bugs as $bug):?>
-    <tr class='a-center'>
-      <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
-      <td><?php echo $lang->bug->severityList[$bug->severity]?></td>
-      <td><?php echo $lang->bug->priList[$bug->pri]?></td>
-      <td class='a-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
-      <td><?php echo $users[$bug->openedBy];?></td>
-      <td><?php echo $users[$bug->assignedTo];?></td>
-      <td><?php echo $users[$bug->resolvedBy];?></td>
-      <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
-      <td>
-        <?php
-        $params = "bugID=$bug->id";
-        if(!($bug->status == 'active'   and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' ';
-        if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose)))     echo $lang->bug->buttonClose . ' ';
-        common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
-        ?>
-      </td>
-    </tr>
-    <?php endforeach;?>
-    </tbody>
-  </table>
-  <div class='a-right'><?php $pager->show();?></div>
-</div>  
+<table class='table-1 fixed colored tablesorter'>
+  <caption class='caption-tl'>
+    <div class='f-left'><?php echo $lang->project->bug;?></div>
+    <div class='f-right'><?php common::printLink('bug', 'create', "productID=$productID&extra=projectID=$project->id", $lang->bug->create);?></div>
+  </caption>
+  <thead>
+  <tr class='colhead'>
+    <?php $vars = "projectID={$project->id}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+    <th class='w-id'>      <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
+    <th class='w-severity'><?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
+    <th class='w-pri'>     <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
+    <th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
+    <th class='w-user'><?php common::printOrderLink('openedBy',   $orderBy, $vars, $lang->openedByAB);?></th>
+    <th class='w-user'><?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+    <th class='w-user'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
+    <th class='w-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
+    <th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
+  </tr>
+  </thead>
+  <tbody>
+  <?php foreach($bugs as $bug):?>
+  <tr class='a-center'>
+    <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
+    <td><?php echo $lang->bug->severityList[$bug->severity]?></td>
+    <td><?php echo $lang->bug->priList[$bug->pri]?></td>
+    <td class='a-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+    <td><?php echo $users[$bug->openedBy];?></td>
+    <td><?php echo $users[$bug->assignedTo];?></td>
+    <td><?php echo $users[$bug->resolvedBy];?></td>
+    <td><?php echo $lang->bug->resolutionList[$bug->resolution];?></td>
+    <td>
+      <?php
+      $params = "bugID=$bug->id";
+      if(!($bug->status == 'active'   and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve))) echo $lang->bug->buttonResolve . ' ';
+      if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose)))     echo $lang->bug->buttonClose . ' ';
+      common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
+      ?>
+    </td>
+  </tr>
+  <?php endforeach;?>
+  </tbody>
+</table>
+  <?php $pager->show();?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index 3f53fd15cb..bf0517e5ac 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -12,41 +12,39 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<div class='yui-d0'>
-  <table class='table-1 tablesorter fixed'>
-    <caption class='caption-tl'>
-      <div class='f-left'><?php echo $lang->project->build;?></div>
-      <div class='f-right'><?php common::printLink('build', 'create', "project=$project->id", $lang->build->create);?></div>
-    </caption>
-    <thead>
-    <tr class='colhead'>
-      <th class='w-120px'><?php echo $lang->build->product;?></th>
-      <th><?php echo $lang->build->name;?></th>
-      <th><?php echo $lang->build->scmPath;?></th>
-      <th><?php echo $lang->build->filePath;?></th>
-      <th class='w-date'><?php echo $lang->build->date;?></th>
-      <th class='w-user'><?php echo $lang->build->builder;?></th>
-      <th class='w-60px'><?php echo $lang->actions;?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php foreach($builds as $build):?>
-    <tr class='a-center'>
-      <td><?php echo $build->productName;?></td>
-      <td class='a-left'><?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?></td>
-      <td class='a-left nobr'><?php strpos($build->scmPath,  'http') === 0 ? printf(html::a($build->scmPath))  : printf($build->scmPath);?></td>
-      <td class='a-left nobr'><?php strpos($build->filePath, 'http') === 0 ? printf(html::a($build->filePath)) : printf($build->filePath);?></td>
-      <td><?php echo $build->date?></td>
-      <td><?php echo $users[$build->builder]?></td>
-      <td>
-        <?php 
-        common::printLink('build', 'edit',   "buildID=$build->id", $lang->edit);
-        common::printLink('build', 'delete', "buildID=$build->id", $lang->delete, 'hiddenwin');
-        ?>
-      </td>
-    </tr>
-    <?php endforeach;?>
-    </tbody>
-  </table>
-</div>  
+<table class='table-1 tablesorter fixed'>
+  <caption class='caption-tl'>
+    <div class='f-left'><?php echo $lang->project->build;?></div>
+    <div class='f-right'><?php common::printLink('build', 'create', "project=$project->id", $lang->build->create);?></div>
+  </caption>
+  <thead>
+  <tr class='colhead'>
+    <th class='w-120px'><?php echo $lang->build->product;?></th>
+    <th><?php echo $lang->build->name;?></th>
+    <th><?php echo $lang->build->scmPath;?></th>
+    <th><?php echo $lang->build->filePath;?></th>
+    <th class='w-date'><?php echo $lang->build->date;?></th>
+    <th class='w-user'><?php echo $lang->build->builder;?></th>
+    <th class='w-60px'><?php echo $lang->actions;?></th>
+  </tr>
+  </thead>
+  <tbody>
+  <?php foreach($builds as $build):?>
+  <tr class='a-center'>
+    <td><?php echo $build->productName;?></td>
+    <td class='a-left'><?php echo html::a($this->createLink('build', 'view', "build=$build->id"), $build->name);?></td>
+    <td class='a-left nobr'><?php strpos($build->scmPath,  'http') === 0 ? printf(html::a($build->scmPath))  : printf($build->scmPath);?></td>
+    <td class='a-left nobr'><?php strpos($build->filePath, 'http') === 0 ? printf(html::a($build->filePath)) : printf($build->filePath);?></td>
+    <td><?php echo $build->date?></td>
+    <td><?php echo $users[$build->builder]?></td>
+    <td>
+      <?php 
+      common::printLink('build', 'edit',   "buildID=$build->id", $lang->edit);
+      common::printLink('build', 'delete', "buildID=$build->id", $lang->delete, 'hiddenwin');
+      ?>
+    </td>
+  </tr>
+  <?php endforeach;?>
+  </tbody>
+</table>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/burn.html.php b/module/project/view/burn.html.php
index b9a601617a..e6290a0f73 100644
--- a/module/project/view/burn.html.php
+++ b/module/project/view/burn.html.php
@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class='yui-d0 a-center'>
+<div class='a-center'>
   <?php
   echo $charts; 
   common::printLink('project', 'computeBurn', 'reload=yes', $lang->project->computeBurn, 'hiddenwin');
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index d8120e34ca..91739900a3 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -15,9 +15,9 @@
 <?php include '../../common/view/colorbox.html.php';?>
 <body style='background:white'>
 <script language='Javascript'>
-var tips = <?php echo json_encode($tips);?>;
+var tips      = <?php echo json_encode($tips);?>;
 var projectID = <?php echo $projectID;?>;
-defaultURL = createLink('project', 'task', 'projectID=' + projectID);
+defaultURL    = createLink('project', 'task', 'projectID=' + projectID);
 $(document).ready(function() 
 {
     $.fn.colorbox({html:tips, open:true, width:480, height:280});
@@ -31,61 +31,53 @@ $(document).ready(function()
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<script language='Javascript'>
-function setWhite(acl)
-{
-    acl == 'custom' ? $('#whitelistBox').removeClass('hidden') : $('#whitelistBox').addClass('hidden');
-}
-</script>
-<div class='yui-d0'>
-  <form method='post' target='hiddenwin'>
-    <table align='center' class='table-1 a-left'> 
-      <caption><?php echo $lang->project->create;?></caption>
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->name;?></th>
-        <td><?php echo html::input('name', '', "class='text-3'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->code;?></th>
-        <td><?php echo html::input('code', '', "class='text-3'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->begin;?></th>
-        <td><?php echo html::input('begin', '', "class='text-3 date'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->end;?></th>
-        <td><?php echo html::input('end', '', "class='text-3 date'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->teamname;?></th>
-        <td><?php echo html::input('team', '', "class='text-3'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
-        <td><?php echo html::checkbox("products", $allProducts, '');?></td>
-      </tr>
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->goal;?></th>
-        <td><?php echo html::textarea('goal', '', "rows='6' class='area-1'");?></td>
-      </tr>  
+<form method='post' target='hiddenwin'>
+  <table align='center' class='table-1 a-left'> 
+    <caption><?php echo $lang->project->create;?></caption>
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->name;?></th>
+      <td><?php echo html::input('name', '', "class='text-3'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->code;?></th>
+      <td><?php echo html::input('code', '', "class='text-3'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->begin;?></th>
+      <td><?php echo html::input('begin', '', "class='text-3 date'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->end;?></th>
+      <td><?php echo html::input('end', '', "class='text-3 date'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->teamname;?></th>
+      <td><?php echo html::input('team', '', "class='text-3'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
+      <td><?php echo html::checkbox("products", $allProducts, '');?></td>
+    </tr>
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->goal;?></th>
+      <td><?php echo html::textarea('goal', '', "rows='6' class='area-1'");?></td>
+    </tr>  
 
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->desc;?></th>
-        <td><?php echo html::textarea('desc', '', "rows='6' class='area-1'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->acl;?></th>
-        <td><?php echo nl2br(html::radio('acl', $lang->project->aclList, 'open', "onclick='setWhite(this.value);'"));?></td>
-      </tr>  
-      <tr id='whitelistBox' class='hidden'>
-        <th class='rowhead'><?php echo $lang->project->whitelist;?></th>
-        <td><?php echo html::checkbox('whitelist', $groups);?></td>
-      </tr>  
-      <tr>
-        <td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td>
-      </tr>
-    </table>
-  </form>
-</div>
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->desc;?></th>
+      <td><?php echo html::textarea('desc', '', "rows='6' class='area-1'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->acl;?></th>
+      <td><?php echo nl2br(html::radio('acl', $lang->project->aclList, 'open', "onclick='setWhite(this.value);'"));?></td>
+    </tr>  
+    <tr id='whitelistBox' class='hidden'>
+      <th class='rowhead'><?php echo $lang->project->whitelist;?></th>
+      <td><?php echo html::checkbox('whitelist', $groups);?></td>
+    </tr>  
+    <tr>
+      <td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td>
+    </tr>
+  </table>
+</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/doc.html.php b/module/project/view/doc.html.php
index a4f01e476b..e36ed0c6d2 100644
--- a/module/project/view/doc.html.php
+++ b/module/project/view/doc.html.php
@@ -13,42 +13,39 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
 <?php include '../../common/view/colorize.html.php';?>
-<div class='yui-d0'>
-
-  <table class='table-1 fixed colored tablesorter' align='center'>
-    <caption class='caption-tr'><?php common::printLink('doc', 'create', "libID=project&moduleID=0&productID=0&projectID=$project->id&from=project", $lang->doc->create);?></caption>
-    <thead>
-      <tr class='colhead'>
-        <th class='w-id'><?php echo $lang->idAB;?></th>
-        <th><?php echo $lang->doc->module;?></th>
-        <th><?php echo $lang->doc->title;?></th>
-        <th><?php echo $lang->doc->addedBy;?></th>
-        <th><?php echo $lang->doc->addedDate;?></th>
-        <th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
-      </tr>
-    </thead>
-    <tbody>
-      <?php foreach($docs as $key => $doc):?>
-      <?php
-      $viewLink = $this->createLink('doc', 'view', "docID=$doc->id");
-      $canView  = common::hasPriv('doc', 'view');
-      ?>
-      <tr class='a-center'>
-        <td><?php if($canView) echo html::a($viewLink, sprintf('%03d', $doc->id)); else printf('%03d', $doc->id);?></td>
-        <td><?php @print($modules[$doc->module]);?></td>
-        <td class='a-left nobr'><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
-        <td><?php echo $users[$doc->addedBy];?></td>
-        <td><?php echo $doc->addedDate;?></td>
-        <td>
-          <?php 
-          $vars = "doc={$doc->id}";
-          if(!common::printLink('doc', 'edit',   $vars, $lang->edit)) echo $lang->edit;
-          if(!common::printLink('doc', 'delete', $vars, $lang->delete, 'hiddenwin')) echo $lang->delete;
-          ?>
-        </td>
-      </tr>
-      <?php endforeach;?>
-    </tbody>
-  </table>
-</div>  
+<table class='table-1 fixed colored tablesorter' align='center'>
+  <caption class='caption-tr'><?php common::printLink('doc', 'create', "libID=project&moduleID=0&productID=0&projectID=$project->id&from=project", $lang->doc->create);?></caption>
+  <thead>
+    <tr class='colhead'>
+      <th class='w-id'><?php echo $lang->idAB;?></th>
+      <th><?php echo $lang->doc->module;?></th>
+      <th><?php echo $lang->doc->title;?></th>
+      <th><?php echo $lang->doc->addedBy;?></th>
+      <th><?php echo $lang->doc->addedDate;?></th>
+      <th class='w-100px {sorter:false}'><?php echo $lang->actions;?></th>
+    </tr>
+  </thead>
+  <tbody>
+    <?php foreach($docs as $key => $doc):?>
+    <?php
+    $viewLink = $this->createLink('doc', 'view', "docID=$doc->id");
+    $canView  = common::hasPriv('doc', 'view');
+    ?>
+    <tr class='a-center'>
+      <td><?php if($canView) echo html::a($viewLink, sprintf('%03d', $doc->id)); else printf('%03d', $doc->id);?></td>
+      <td><?php @print($modules[$doc->module]);?></td>
+      <td class='a-left nobr'><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
+      <td><?php echo $users[$doc->addedBy];?></td>
+      <td><?php echo $doc->addedDate;?></td>
+      <td>
+        <?php 
+        $vars = "doc={$doc->id}";
+        if(!common::printLink('doc', 'edit',   $vars, $lang->edit)) echo $lang->edit;
+        if(!common::printLink('doc', 'delete', $vars, $lang->delete, 'hiddenwin')) echo $lang->delete;
+        ?>
+      </td>
+    </tr>
+    <?php endforeach;?>
+  </tbody>
+</table>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 957c60bb4c..a7d61e81b6 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -13,79 +13,70 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<script language='Javascript'>
-function setWhite(acl)
-{
-    acl == 'custom' ? $('#whitelistBox').removeClass('hidden') : $('#whitelistBox').addClass('hidden');
-}
-</script>
-
-<div class='yui-d0'>
-  <form method='post' target='hiddenwin'>
-    <table align='center' class='table-1 a-left'> 
-      <caption><?php echo $lang->project->edit;?></caption>
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->name;?></th>
-        <td><?php echo html::input('name', $project->name, "class='text-3'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->code;?></th>
-        <td><?php echo html::input('code', $project->code, "class='text-3'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->begin;?></th>
-        <td><?php echo html::input('begin', $project->begin, "class='text-3 date'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->end;?></th>
-        <td><?php echo html::input('end', $project->end, "class='text-3 date'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->teamname;?></th>
-        <td><?php echo html::input('team', $project->team, "class='text-3'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->status;?></th>
-        <td><?php echo html::select('status', $lang->project->statusList, $project->status, 'class=text-3');?></td>
-      </tr>
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->PO;?></th>
-        <td><?php echo html::select('PO', $users, $project->PO, 'class=text-3');?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->PM;?></th>
-        <td><?php echo html::select('PM', $users, $project->PM, 'class=text-3');?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->QM;?></th>
-        <td><?php echo html::select('QM', $users, $project->QM, 'class=text-3');?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->RM;?></th>
-        <td><?php echo html::select('RM', $users, $project->RM, 'class=text-3');?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
-        <td><?php echo html::checkbox("products", $allProducts, $linkedProducts);?></td>
-      </tr>
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->goal;?></th>
-        <td><?php echo html::textarea('goal', htmlspecialchars($project->goal), "rows='6' class='area-1'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->desc;?></th>
-        <td><?php echo html::textarea('desc', htmlspecialchars($project->desc), "rows='6' class='area-1'");?></td>
-      </tr>  
-      <tr>
-        <th class='rowhead'><?php echo $lang->project->acl;?></th>
-        <td><?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'"));?></td>
-      </tr>  
-      <tr id='whitelistBox' <?php if($project->acl != 'custom') echo "class='hidden'";?>>
-        <th class='rowhead'><?php echo $lang->project->whitelist;?></th>
-        <td><?php echo html::checkbox('whitelist', $groups, $project->whitelist);?></td>
-      </tr>  
-      <tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td></tr>
-    </table>
-  </form>
-</div>
+<form method='post' target='hiddenwin'>
+  <table align='center' class='table-1 a-left'> 
+    <caption><?php echo $lang->project->edit;?></caption>
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->name;?></th>
+      <td><?php echo html::input('name', $project->name, "class='text-3'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->code;?></th>
+      <td><?php echo html::input('code', $project->code, "class='text-3'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->begin;?></th>
+      <td><?php echo html::input('begin', $project->begin, "class='text-3 date'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->end;?></th>
+      <td><?php echo html::input('end', $project->end, "class='text-3 date'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->teamname;?></th>
+      <td><?php echo html::input('team', $project->team, "class='text-3'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->status;?></th>
+      <td><?php echo html::select('status', $lang->project->statusList, $project->status, 'class=text-3');?></td>
+    </tr>
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->PO;?></th>
+      <td><?php echo html::select('PO', $users, $project->PO, 'class=text-3');?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->PM;?></th>
+      <td><?php echo html::select('PM', $users, $project->PM, 'class=text-3');?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->QM;?></th>
+      <td><?php echo html::select('QM', $users, $project->QM, 'class=text-3');?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->RM;?></th>
+      <td><?php echo html::select('RM', $users, $project->RM, 'class=text-3');?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
+      <td><?php echo html::checkbox("products", $allProducts, $linkedProducts);?></td>
+    </tr>
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->goal;?></th>
+      <td><?php echo html::textarea('goal', htmlspecialchars($project->goal), "rows='6' class='area-1'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->desc;?></th>
+      <td><?php echo html::textarea('desc', htmlspecialchars($project->desc), "rows='6' class='area-1'");?></td>
+    </tr>  
+    <tr>
+      <th class='rowhead'><?php echo $lang->project->acl;?></th>
+      <td><?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'"));?></td>
+    </tr>  
+    <tr id='whitelistBox' <?php if($project->acl != 'custom') echo "class='hidden'";?>>
+      <th class='rowhead'><?php echo $lang->project->whitelist;?></th>
+      <td><?php echo html::checkbox('whitelist', $groups, $project->whitelist);?></td>
+    </tr>  
+    <tr><td colspan='2' class='a-center'><?php echo html::submitButton() . html::resetButton();?></td></tr>
+  </table>
+</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php
index a2d07f1b2e..bad0556214 100644
--- a/module/project/view/grouptask.html.php
+++ b/module/project/view/grouptask.html.php
@@ -13,50 +13,48 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/treetable.html.php';?>
 <?php include './taskheader.html.php';?>
-<div class='yui-d0'>
-  <table class='table-1' id='treetable'>
-    <tr class='colhead'>
-      <th></th>
-      <th><?php echo $lang->task->name;?></th>
-      <th class='w-pri'><?php echo $lang->priAB;?></th>
-      <th class='w-user'><?php echo $lang->task->assignedTo;?></th>
-      <th class='w-user'><?php echo $lang->task->finishedBy;?></th>
-      <th><?php echo $lang->task->estimateAB;?></th>
-      <th><?php echo $lang->task->consumedAB;?></th>
-      <th><?php echo $lang->task->leftAB;?></th>
-      <th><?php echo $lang->typeAB;?></th>
-      <th><?php echo $lang->task->deadlineAB;?></th>
-      <th colspan='2' class='a-left'><?php echo $lang->task->status;?></th>
+<table class='table-1' id='treetable'>
+  <tr class='colhead'>
+    <th></th>
+    <th><?php echo $lang->task->name;?></th>
+    <th class='w-pri'><?php echo $lang->priAB;?></th>
+    <th class='w-user'><?php echo $lang->task->assignedTo;?></th>
+    <th class='w-user'><?php echo $lang->task->finishedBy;?></th>
+    <th><?php echo $lang->task->estimateAB;?></th>
+    <th><?php echo $lang->task->consumedAB;?></th>
+    <th><?php echo $lang->task->leftAB;?></th>
+    <th><?php echo $lang->typeAB;?></th>
+    <th><?php echo $lang->task->deadlineAB;?></th>
+    <th colspan='2' class='a-left'><?php echo $lang->task->status;?></th>
+  </tr>
+  <?php $i = 0;?>
+  <?php foreach($tasks as $groupKey => $groupTasks):?>
+  <?php $groupClass = ($i % 2 == 0) ? 'even' : 'bg-yellow'; $i ++;?>
+  <tr id='node-<?php echo $groupKey;?>'>
+    <td class='<?php echo $groupClass;?> a-center f-16px strong'><?php echo $groupKey;?></td>
+    <td colspan='10'><?php if($groupByList) echo $groupByList[$groupKey];?></td>
+  </tr>
+    <?php foreach($groupTasks as $task):?>
+    <?php $assignedToClass = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
+    <tr id='<?php echo $task->id;?>' class='a-center child-of-node-<?php echo $groupKey;?>'>
+      <td class='<?php echo $groupClass;?>'></td>
+      <td class='a-left'>&nbsp;<?php echo $task->id . $lang->colon; if(common::hasPriv('task', 'view')) echo html::a($this->createLink('task', 'view', "task=$task->id"), $task->name); else echo $task->name;?></td>
+      <td><?php echo $task->pri;?></td>
+      <td <?php echo $assignedToClass;?>><?php echo $task->assignedToRealName;?></td>
+      <td><?php echo $users[$task->finishedBy];?></td>
+      <td><?php echo $task->estimate;?></td>
+      <td><?php echo $task->consumed;?></td>
+      <td><?php echo $task->left;?></td>
+      <td><?php echo $lang->task->typeList[$task->type];?></td>
+      <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
+      <td class=<?php echo $task->status;?> ><?php echo $lang->task->statusList[$task->status];?></td>
+      <td>
+        <?php if(common::hasPriv('task', 'edit'))   echo html::a($this->createLink('task', 'edit',   "taskid=$task->id"), $lang->edit);?>
+        <?php if(common::hasPriv('task', 'delete')) echo html::a($this->createLink('task', 'delete', "projectID=$task->project&taskid=$task->id"), $lang->delete, 'hiddenwin');?>
+      </td>
     </tr>
-    <?php $i = 0;?>
-    <?php foreach($tasks as $groupKey => $groupTasks):?>
-    <?php $groupClass = ($i % 2 == 0) ? 'even' : 'bg-yellow'; $i ++;?>
-    <tr id='node-<?php echo $groupKey;?>'>
-      <td class='<?php echo $groupClass;?> a-center f-16px strong'><?php echo $groupKey;?></td>
-      <td colspan='10'><?php if($groupByList) echo $groupByList[$groupKey];?></td>
-    </tr>
-      <?php foreach($groupTasks as $task):?>
-      <?php $assignedToClass = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
-      <tr id='<?php echo $task->id;?>' class='a-center child-of-node-<?php echo $groupKey;?>'>
-        <td class='<?php echo $groupClass;?>'></td>
-        <td class='a-left'>&nbsp;<?php echo $task->id . $lang->colon; if(common::hasPriv('task', 'view')) echo html::a($this->createLink('task', 'view', "task=$task->id"), $task->name); else echo $task->name;?></td>
-        <td><?php echo $task->pri;?></td>
-        <td <?php echo $assignedToClass;?>><?php echo $task->assignedToRealName;?></td>
-        <td><?php echo $users[$task->finishedBy];?></td>
-        <td><?php echo $task->estimate;?></td>
-        <td><?php echo $task->consumed;?></td>
-        <td><?php echo $task->left;?></td>
-        <td><?php echo $lang->task->typeList[$task->type];?></td>
-        <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
-        <td class=<?php echo $task->status;?> ><?php echo $lang->task->statusList[$task->status];?></td>
-        <td>
-          <?php if(common::hasPriv('task', 'edit'))   echo html::a($this->createLink('task', 'edit',   "taskid=$task->id"), $lang->edit);?>
-          <?php if(common::hasPriv('task', 'delete')) echo html::a($this->createLink('task', 'delete', "projectID=$task->project&taskid=$task->id"), $lang->delete, 'hiddenwin');?>
-        </td>
-      </tr>
-      <?php endforeach;?>
     <?php endforeach;?>
-  </table>
-</div>  
+  <?php endforeach;?>
+</table>
 <script language='Javascript'>$('#<?php echo $browseType;?>Tab').addClass('active');</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/importtask.html.php b/module/project/view/importtask.html.php
index a732e7465e..ffcc8fdacf 100644
--- a/module/project/view/importtask.html.php
+++ b/module/project/view/importtask.html.php
@@ -12,8 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<div class='yui-d0'>
-  <form method='post' target='hiddenwin'>
+<form method='post' target='hiddenwin'>
   <table class='table-1 fixed tablesorter'>
     <thead>
     <tr class='colhead'>
@@ -56,6 +55,5 @@
     </tbody>
   </table>
   <div class='a-right'><?php echo html::submitButton($lang->project->importTask);?></div>
-  </form>
-</div>  
+</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php
index d7717686f3..d6ac96051e 100644
--- a/module/project/view/linkstory.html.php
+++ b/module/project/view/linkstory.html.php
@@ -12,42 +12,40 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<div class='yui-d0'>
-  <form method='post' target='hiddenwin'>
-    <table align='center' class='table-1 tablesorter a-center'> 
-      <thead>
-      <tr class='colhead'>
-        <th class='w-id'><?php echo $lang->idAB;?></th>
-        <th class='w-pri'><?php echo $lang->priAB;?></th>
-        <th><?php echo $lang->story->product;?></th>
-        <th><?php echo $lang->story->title;?></th>
-        <th><?php echo $lang->story->plan;?></th>
-        <th class='w-user'><?php echo $lang->openedByAB;?></th>
-        <th class='w-hour'><?php echo $lang->story->estimateAB;?></th>
-        <th class='w-50px'><?php echo $lang->link;?></th>
-      </tr>
-      </thead>
-      <tbody>
-      <?php foreach($allStories as $story):?>
-      <?php if(isset($prjStories[$story->id])) continue;?>
-      <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id");?>
-      <tr>
-        <td><?php echo html::a($storyLink, $story->id);?></td>
-        <td><?php echo $lang->story->priList[$story->pri];?></td>
-        <td><?php echo html::a($this->createLink('product', 'browse', "productID=$story->product"), $products[$story->product], '_blank');?></td>
-        <td class='a-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
-        <td><?php echo $story->planTitle;?></td>
-        <td><?php echo $users[$story->openedBy];?></td>
-        <td><?php echo $story->estimate;?></td>
-        <td>
-          <input type='checkbox' name='stories[]'  value='<?php echo $story->id;?>' />
-          <input type='hidden'   name='products[]' value='<?php echo $story->product;?>' />
-        </td>
-      </tr>
-      <?php endforeach;?>
-      </tbody>
-      <tfoot><tr><td colspan='8'><?php echo html::submitButton();?></td></tr></tfoot>
-    </table>
-  </form>
-</div>
+<form method='post' target='hiddenwin'>
+  <table align='center' class='table-1 tablesorter a-center'> 
+    <thead>
+    <tr class='colhead'>
+      <th class='w-id'><?php echo $lang->idAB;?></th>
+      <th class='w-pri'><?php echo $lang->priAB;?></th>
+      <th><?php echo $lang->story->product;?></th>
+      <th><?php echo $lang->story->title;?></th>
+      <th><?php echo $lang->story->plan;?></th>
+      <th class='w-user'><?php echo $lang->openedByAB;?></th>
+      <th class='w-hour'><?php echo $lang->story->estimateAB;?></th>
+      <th class='w-50px'><?php echo $lang->link;?></th>
+    </tr>
+    </thead>
+    <tbody>
+    <?php foreach($allStories as $story):?>
+    <?php if(isset($prjStories[$story->id])) continue;?>
+    <?php $storyLink = $this->createLink('story', 'view', "storyID=$story->id");?>
+    <tr>
+      <td><?php echo html::a($storyLink, $story->id);?></td>
+      <td><?php echo $lang->story->priList[$story->pri];?></td>
+      <td><?php echo html::a($this->createLink('product', 'browse', "productID=$story->product"), $products[$story->product], '_blank');?></td>
+      <td class='a-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
+      <td><?php echo $story->planTitle;?></td>
+      <td><?php echo $users[$story->openedBy];?></td>
+      <td><?php echo $story->estimate;?></td>
+      <td>
+        <input type='checkbox' name='stories[]'  value='<?php echo $story->id;?>' />
+        <input type='hidden'   name='products[]' value='<?php echo $story->product;?>' />
+      </td>
+    </tr>
+    <?php endforeach;?>
+    </tbody>
+    <tfoot><tr><td colspan='8'><?php echo html::submitButton();?></td></tr></tfoot>
+  </table>
+</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index d57f232ee3..a70fdb5f9c 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -11,47 +11,45 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class='yui-d0'>
-  <form method='post'>
-    <table align='center' class='table-4 a-center'> 
-      <caption><?php echo $lang->project->manageMembers;?></caption>
-      <tr>
-        <th><?php echo $lang->team->account;?></th>
-        <th><?php echo $lang->team->role;?></th>
-        <th><?php echo $lang->team->workingHour;?></th>
-      </tr>
-      <?php foreach($members as $key => $member):?>
-      <?php unset($users[$member->account]);?>
-      <tr>
-        <td><input type='text' name='accounts[]' id='account<?php echo $key;?>' value='<?php echo $member->account;?>' readonly class='text-2' /></td>
-        <td><input type='text' name='roles[]'    id='role<?php echo $key;?>'    value='<?php echo $member->role;?>' class='text-2' /></td>
-        <td>
-          <input type='text'   name='workingHours[]' id='workingHour<?php echo $key;?>' value='<?php echo $member->workingHour;?>' class='text-2' />
-          <input type='hidden' name='modes[]'        value='update' />
-        </td>
-      </tr>
-      <?php endforeach;?>
-      <?php
-      $count = count($users) - 1;
-      if($count > PROJECTMODEL::LINK_MEMBERS_ONE_TIME) $count = PROJECTMODEL::LINK_MEMBERS_ONE_TIME;
-      ?>
+<form method='post'>
+  <table align='center' class='table-4 a-center'> 
+    <caption><?php echo $lang->project->manageMembers;?></caption>
+    <tr>
+      <th><?php echo $lang->team->account;?></th>
+      <th><?php echo $lang->team->role;?></th>
+      <th><?php echo $lang->team->workingHour;?></th>
+    </tr>
+    <?php foreach($members as $key => $member):?>
+    <?php unset($users[$member->account]);?>
+    <tr>
+      <td><input type='text' name='accounts[]' id='account<?php echo $key;?>' value='<?php echo $member->account;?>' readonly class='text-2' /></td>
+      <td><input type='text' name='roles[]'    id='role<?php echo $key;?>'    value='<?php echo $member->role;?>' class='text-2' /></td>
+      <td>
+        <input type='text'   name='workingHours[]' id='workingHour<?php echo $key;?>' value='<?php echo $member->workingHour;?>' class='text-2' />
+        <input type='hidden' name='modes[]'        value='update' />
+      </td>
+    </tr>
+    <?php endforeach;?>
+    <?php
+    $count = count($users) - 1;
+    if($count > PROJECTMODEL::LINK_MEMBERS_ONE_TIME) $count = PROJECTMODEL::LINK_MEMBERS_ONE_TIME;
+    ?>
 
-      <?php for($i = 0; $i < $count; $i ++):?>
-      <tr>
-        <td><?php echo html::select('accounts[]', $users, '', 'class=select-2');?></td>
-        <td><input type='text' name='roles[]' id='role<?php echo ($key + $i);?>' class='text-2' /></td>
-        <td>
-          <input type='text'   name='workingHours[]' id='workingHour<?php echo ($key + $i);?>' class='text-2' />
-          <input type='hidden' name='modes[]' value='create' />
-        </td>
-      </tr>
-      <?php endfor;?>
-      <tr>
-        <td colspan='3'>
-          <input type='submit' name='submit' value='<?php echo $lang->save;?>' class='button-s' />
-        </td>
-      </tr>
-    </table>
-  </form>
-</div>
+    <?php for($i = 0; $i < $count; $i ++):?>
+    <tr>
+      <td><?php echo html::select('accounts[]', $users, '', 'class=select-2');?></td>
+      <td><input type='text' name='roles[]' id='role<?php echo ($key + $i);?>' class='text-2' /></td>
+      <td>
+        <input type='text'   name='workingHours[]' id='workingHour<?php echo ($key + $i);?>' class='text-2' />
+        <input type='hidden' name='modes[]' value='create' />
+      </td>
+    </tr>
+    <?php endfor;?>
+    <tr>
+      <td colspan='3'>
+        <input type='submit' name='submit' value='<?php echo $lang->save;?>' class='button-s' />
+      </td>
+    </tr>
+  </table>
+</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php
index 5e68bca38e..c88a399dba 100644
--- a/module/project/view/manageproducts.html.php
+++ b/module/project/view/manageproducts.html.php
@@ -11,16 +11,13 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<style>span{display:block; float:left; width:200px}</style>
-<div class='yui-d0'>
-  <form method='post'>
-    <table align='center' class='table-4'> 
-      <caption><?php echo $lang->project->manageProducts;?></caption>
-      <tr>
-        <td><?php echo html::checkbox("products", $allProducts, $linkedProducts);?></td>
-      </tr>
-      <tr><td class='a-center'><?php echo html::submitButton();?></td></tr>
-    </table>
-  </form>
-</div>
+<form method='post'>
+  <table align='center' class='table-4'> 
+    <caption><?php echo $lang->project->manageProducts;?></caption>
+    <tr>
+      <td><?php echo html::checkbox("products", $allProducts, $linkedProducts);?></td>
+    </tr>
+    <tr><td class='a-center'><?php echo html::submitButton();?></td></tr>
+  </table>
+</form>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index d1322cb421..fba66dd752 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -12,69 +12,61 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<script language='javascript'>
-$(document).ready(function()
-{
-    $("a.iframe").colorbox({width:640, height:480, iframe:true, transition:'none'});
-});
-</script>
-<div class='yui-d0'>
-  <table class='table-1 tablesorter fixed'>
-    <caption class='caption-tl'>
-      <div class='f-left'><?php echo $lang->project->story;?></div>
-      <div class='f-right'>
-        <?php if(common::hasPriv('project', 'linkstory')) echo html::a($this->createLink('project', 'linkstory', "project=$project->id"), $lang->project->linkStory);?>
-      </div>
-    </caption>
-    <thead>
-      <tr class='colhead'>
-        <th class='w-id'><?php echo $lang->idAB;?></th>
-        <th class='w-pri'><?php echo $lang->priAB;?></th>
-        <th><?php echo $lang->story->title;?></th>
-        <th class='w-user'><?php echo $lang->openedByAB;?></th>
-        <th class='w-user'><?php echo $lang->assignedToAB;?></th>
-        <th class='w-hour'><?php echo $lang->story->estimateAB;?></th>
-        <th class='w-status'><?php echo $lang->statusAB;?></th>
-        <th class='w-status'><?php echo $lang->story->stageAB;?></th>
-        <th class='w-50px'><?php echo $lang->story->taskCount;?></th>
-        <th class='w-100px'><?php echo $lang->actions;?></th>
-      </tr>
-    </thead>
-    <tbody>
-      <?php $totalEstimate = 0;?>
-      <?php foreach($stories as $key => $story):?>
-      <?php
-      $storyLink      = $this->createLink('story', 'view', "storyID=$story->id");
-      $totalEstimate += $story->estimate;
-      ?>
-      <tr class='a-center'>
-        <td><?php echo html::a($storyLink, sprintf('%03d', $story->id));?></td>
-        <td><?php echo $lang->story->priList[$story->pri];?></td>
-        <td class='a-left nobr'><?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='<?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}";
-          common::printLink('task', 'create', $param, $lang->project->wbs);
-          common::printLink('project', 'unlinkStory', $param, $lang->unlink, 'hiddenwin');
-          ?>
-        </td>
-      </tr>
-      <?php endforeach;?>
-    </tbody>
-    <tfoot>
-      <tr><td colspan='10' class='a-right'><?php printf($lang->project->storySummary, count($stories), $totalEstimate);?></td></tr>
-    </tfoot>
-  </table>
-</div>  
+<table class='table-1 tablesorter fixed'>
+  <caption class='caption-tl'>
+    <div class='f-left'><?php echo $lang->project->story;?></div>
+    <div class='f-right'>
+      <?php if(common::hasPriv('project', 'linkstory')) echo html::a($this->createLink('project', 'linkstory', "project=$project->id"), $lang->project->linkStory);?>
+    </div>
+  </caption>
+  <thead>
+    <tr class='colhead'>
+      <th class='w-id'><?php echo $lang->idAB;?></th>
+      <th class='w-pri'><?php echo $lang->priAB;?></th>
+      <th><?php echo $lang->story->title;?></th>
+      <th class='w-user'><?php echo $lang->openedByAB;?></th>
+      <th class='w-user'><?php echo $lang->assignedToAB;?></th>
+      <th class='w-hour'><?php echo $lang->story->estimateAB;?></th>
+      <th class='w-status'><?php echo $lang->statusAB;?></th>
+      <th class='w-status'><?php echo $lang->story->stageAB;?></th>
+      <th class='w-50px'><?php echo $lang->story->taskCount;?></th>
+      <th class='w-100px'><?php echo $lang->actions;?></th>
+    </tr>
+  </thead>
+  <tbody>
+    <?php $totalEstimate = 0;?>
+    <?php foreach($stories as $key => $story):?>
+    <?php
+    $storyLink      = $this->createLink('story', 'view', "storyID=$story->id");
+    $totalEstimate += $story->estimate;
+    ?>
+    <tr class='a-center'>
+      <td><?php echo html::a($storyLink, sprintf('%03d', $story->id));?></td>
+      <td><?php echo $lang->story->priList[$story->pri];?></td>
+      <td class='a-left nobr'><?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='<?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}";
+        common::printLink('task', 'create', $param, $lang->project->wbs);
+        common::printLink('project', 'unlinkStory', $param, $lang->unlink, 'hiddenwin');
+        ?>
+      </td>
+    </tr>
+    <?php endforeach;?>
+  </tbody>
+  <tfoot>
+    <tr><td colspan='10' class='a-right'><?php printf($lang->project->storySummary, count($stories), $totalEstimate);?></td></tr>
+  </tfoot>
+</table>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index c1ff9c6bc8..ebf4e2e28c 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -14,72 +14,70 @@
 <?php include '../../common/view/colorize.html.php';?>
 <?php include '../../common/view/table2csv.html.php';?>
 <?php include './taskheader.html.php';?>
-<div class='yui-d0'>
-  <table class='table-1 fixed colored tablesorter datatable'>
-    <?php $vars = "projectID=$project->id&status=$status&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
-    <thead>
-    <tr class='colhead'>
-      <th class='w-id'>    <?php common::printOrderLink('id',        $orderBy, $vars, $lang->idAB);?></th>
-      <th class='w-pri'>   <?php common::printOrderLink('pri',       $orderBy, $vars, $lang->priAB);?></th>
-      <th class='w-p30'>   <?php common::printOrderLink('name',      $orderBy, $vars, $lang->task->name);?></th>
-      <th class='w-user'>  <?php common::printOrderLink('assignedTo',$orderBy, $vars, $lang->task->assignedTo);?></th>
-      <th class='w-user'>  <?php common::printOrderLink('finishedBy',$orderBy, $vars, $lang->task->finishedBy);?></th>
-      <th class='w-hour'>  <?php common::printOrderLink('estimate',  $orderBy, $vars, $lang->task->estimateAB);?></th>
-      <th class='w-hour'>  <?php common::printOrderLink('consumed',  $orderBy, $vars, $lang->task->consumedAB);?></th>
-      <th class='w-hour'>  <?php common::printOrderLink('left',      $orderBy, $vars, $lang->task->leftAB);?></th>
-      <th class='w-date'>  <?php common::printOrderLink('deadline',  $orderBy, $vars, $lang->task->deadlineAB);?></th>
-      <th class='w-status'><?php common::printOrderLink('status',    $orderBy, $vars, $lang->statusAB);?></th>
-      <th><?php common::printOrderLink('story', $orderBy, $vars, $lang->task->story);?></th>
-      <th class='w-150px {sorter:false}'><?php echo $lang->actions;?></th>
-    </tr>
-    </thead>
-    <tbody>
-    <?php foreach($tasks as $task):?>
-    <?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
-    <tr class='a-center'>
-      <td><?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?></td>
-      <td><?php echo $lang->task->priList[$task->pri];?></td>
-      <td class='a-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
-      <td <?php echo $class;?>><?php echo $task->assignedToRealName;?></td>
-      <td><?php echo $users[$task->finishedBy];?></td>
-      <td><?php echo $task->estimate;?></td>
-      <td><?php echo $task->consumed;?></td>
-      <td><?php echo $task->left;?></td>
-      <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
-      <td class=<?php echo $task->status;?> >
-        <?php
-        if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion)
-        {
-            echo "<span class='warning'>{$lang->story->changed}</span> ";
-        }
-        else
-        {
-            echo $lang->task->statusList[$task->status];
-        }
-        ?>
-      </td>
-      <td class='a-left nobr'>
-        <?php 
-        if($task->storyID)
-        {
-            if(common::hasPriv('story', 'view')) echo html::a($this->createLink('story', 'view', "storyid=$task->storyID"), $task->storyTitle);
-            else echo $task->storyTitle;
-        }
-        ?>
-      </td>
-      <td>
-        <?php
-        if(!(($task->status == 'wait'  or $task->status == 'doing')  and common::printLink('task', 'finish', "taskID=$task->id", $lang->task->buttonDone))) echo $lang->task->buttonDone . ' ';
-        if(!(($task->status == 'done'   or $task->status == 'cancel') and common::printLink('task', 'close', "taskID=$task->id", $lang->task->buttonClose))) echo $lang->task->buttonClose . ' ';
-        if(!common::printLink('task', 'edit',  "taskID=$task->id", $lang->task->buttonEdit)) echo $lang->task->buttonEdit . ' ';
-        if($browseType == 'needconfirm') common::printLink('task', 'confirmStoryChange', "taskid=$task->id", $lang->confirm, 'hiddenwin');
-        ?>
-      </td>
-    </tr>
-    <?php endforeach;?>
-    </tbody>
-  </table>
-  <div class='a-right'><?php echo $pager;?></div>
-</div>  
+<table class='table-1 fixed colored tablesorter datatable'>
+  <?php $vars = "projectID=$project->id&status=$status&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?>
+  <thead>
+  <tr class='colhead'>
+    <th class='w-id'>    <?php common::printOrderLink('id',        $orderBy, $vars, $lang->idAB);?></th>
+    <th class='w-pri'>   <?php common::printOrderLink('pri',       $orderBy, $vars, $lang->priAB);?></th>
+    <th class='w-p30'>   <?php common::printOrderLink('name',      $orderBy, $vars, $lang->task->name);?></th>
+    <th class='w-user'>  <?php common::printOrderLink('assignedTo',$orderBy, $vars, $lang->task->assignedTo);?></th>
+    <th class='w-user'>  <?php common::printOrderLink('finishedBy',$orderBy, $vars, $lang->task->finishedBy);?></th>
+    <th class='w-hour'>  <?php common::printOrderLink('estimate',  $orderBy, $vars, $lang->task->estimateAB);?></th>
+    <th class='w-hour'>  <?php common::printOrderLink('consumed',  $orderBy, $vars, $lang->task->consumedAB);?></th>
+    <th class='w-hour'>  <?php common::printOrderLink('left',      $orderBy, $vars, $lang->task->leftAB);?></th>
+    <th class='w-date'>  <?php common::printOrderLink('deadline',  $orderBy, $vars, $lang->task->deadlineAB);?></th>
+    <th class='w-status'><?php common::printOrderLink('status',    $orderBy, $vars, $lang->statusAB);?></th>
+    <th><?php common::printOrderLink('story', $orderBy, $vars, $lang->task->story);?></th>
+    <th class='w-150px {sorter:false}'><?php echo $lang->actions;?></th>
+  </tr>
+  </thead>
+  <tbody>
+  <?php foreach($tasks as $task):?>
+  <?php $class = $task->assignedTo == $app->user->account ? 'style=color:red' : '';?>
+  <tr class='a-center'>
+    <td><?php if(!common::printLink('task', 'view', "task=$task->id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?></td>
+    <td><?php echo $lang->task->priList[$task->pri];?></td>
+    <td class='a-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
+    <td <?php echo $class;?>><?php echo $task->assignedToRealName;?></td>
+    <td><?php echo $users[$task->finishedBy];?></td>
+    <td><?php echo $task->estimate;?></td>
+    <td><?php echo $task->consumed;?></td>
+    <td><?php echo $task->left;?></td>
+    <td class=<?php if(isset($task->delay)) echo 'delayed';?>><?php if(substr($task->deadline, 0, 4) > 0) echo $task->deadline;?></td>
+    <td class=<?php echo $task->status;?> >
+      <?php
+      if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion)
+      {
+          echo "<span class='warning'>{$lang->story->changed}</span> ";
+      }
+      else
+      {
+          echo $lang->task->statusList[$task->status];
+      }
+      ?>
+    </td>
+    <td class='a-left nobr'>
+      <?php 
+      if($task->storyID)
+      {
+          if(common::hasPriv('story', 'view')) echo html::a($this->createLink('story', 'view', "storyid=$task->storyID"), $task->storyTitle);
+          else echo $task->storyTitle;
+      }
+      ?>
+    </td>
+    <td>
+      <?php
+      if(!(($task->status == 'wait'  or $task->status == 'doing')  and common::printLink('task', 'finish', "taskID=$task->id", $lang->task->buttonDone))) echo $lang->task->buttonDone . ' ';
+      if(!(($task->status == 'done'   or $task->status == 'cancel') and common::printLink('task', 'close', "taskID=$task->id", $lang->task->buttonClose))) echo $lang->task->buttonClose . ' ';
+      if(!common::printLink('task', 'edit',  "taskID=$task->id", $lang->task->buttonEdit)) echo $lang->task->buttonEdit . ' ';
+      if($browseType == 'needconfirm') common::printLink('task', 'confirmStoryChange', "taskid=$task->id", $lang->confirm, 'hiddenwin');
+      ?>
+    </td>
+  </tr>
+  <?php endforeach;?>
+  </tbody>
+</table>
+<div class='a-right'><?php echo $pager;?></div>
 <script language='Javascript'>$('#<?php echo $browseType;?>Tab').addClass('active');</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index 55a1515308..6bbfb1ba09 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -1,34 +1,25 @@
-<script language='Javascript'>
-function switchGroup(projectID, groupBy)
-{
-    link = createLink('project', 'groupTask', 'project=' + projectID + '&groupBy=' + groupBy);
-    location.href=link;
-}
-</script>
-<div class="yui-d0">
-  <div id='featurebar'>
-    <div class='f-left'>
-    <?php
-    echo "<span id='allTab'>"         ; common::printLink('project', 'task', "project=$project->id",                   $lang->project->allTasks);     echo  '</span>' ;
-    echo "<span id='assignedtomeTab'>"; common::printLink('project', 'task', "project=$project->id&type=assignedtome", $lang->project->assignedToMe); echo  '</span>' ;
-    echo "<span id='finishedbymeTab'>"; common::printLink('project', 'task', "project=$project->id&type=finishedbyme", $lang->project->finishedByMe); echo  '</span>' ;
-    echo "<span id='waitTab'>"        ; common::printLink('project', 'task', "project=$project->id&type=wait",         $lang->project->statusWait);   echo  '</span>' ;
-    echo "<span id='doingTab'>"       ; common::printLink('project', 'task', "project=$project->id&type=doing",        $lang->project->statusDoing);  echo  '</span>' ;
-    echo "<span id='doneTab'>"        ; common::printLink('project', 'task', "project=$project->id&type=done",         $lang->project->statusDone);   echo  '</span>' ;
-    echo "<span id='delayedTab'>"     ; common::printLink('project', 'task', "project=$project->id&type=delayed",      $lang->project->delayed);      echo  '</span>' ;
+<div id='featurebar'>
+  <div class='f-left'>
+  <?php
+  echo "<span id='allTab'>"         ; common::printLink('project', 'task', "project=$project->id",                   $lang->project->allTasks);     echo  '</span>' ;
+  echo "<span id='assignedtomeTab'>"; common::printLink('project', 'task', "project=$project->id&type=assignedtome", $lang->project->assignedToMe); echo  '</span>' ;
+  echo "<span id='finishedbymeTab'>"; common::printLink('project', 'task', "project=$project->id&type=finishedbyme", $lang->project->finishedByMe); echo  '</span>' ;
+  echo "<span id='waitTab'>"        ; common::printLink('project', 'task', "project=$project->id&type=wait",         $lang->project->statusWait);   echo  '</span>' ;
+  echo "<span id='doingTab'>"       ; common::printLink('project', 'task', "project=$project->id&type=doing",        $lang->project->statusDoing);  echo  '</span>' ;
+  echo "<span id='doneTab'>"        ; common::printLink('project', 'task', "project=$project->id&type=done",         $lang->project->statusDone);   echo  '</span>' ;
+  echo "<span id='delayedTab'>"     ; common::printLink('project', 'task', "project=$project->id&type=delayed",      $lang->project->delayed);      echo  '</span>' ;
 
-    echo "<span id='groupTab'>";
-    echo html::select('groupBy', $lang->project->groups, isset($groupBy) ? $groupBy : '', "onchange='switchGroup({$project->id}, this.value)'");
-    echo "</span>";
-    echo "<span id='needconfirmTab'>"; common::printLink('project', 'task',  "project=$project->id&status=needConfirm",$lang->project->listTaskNeedConfrim); echo  '</span>' ;
+  echo "<span id='groupTab'>";
+  echo html::select('groupBy', $lang->project->groups, isset($groupBy) ? $groupBy : '', "onchange='switchGroup({$project->id}, this.value)'");
+  echo "</span>";
+  echo "<span id='needconfirmTab'>"; common::printLink('project', 'task',  "project=$project->id&status=needConfirm",$lang->project->listTaskNeedConfrim); echo  '</span>' ;
+  ?>
+  </div>
+  <div class='f-right'>
+    <?php 
+    echo html::export2csv($lang->exportCSV, $lang->setFileName);
+    common::printLink('project', 'importTask', "project=$project->id", $lang->project->importTask);
+    common::printLink('task', 'create', "project=$project->id", $lang->task->create);
     ?>
-    </div>
-    <div class='f-right'>
-      <?php 
-      echo html::export2csv($lang->exportCSV, $lang->setFileName);
-      common::printLink('project', 'importTask', "project=$project->id", $lang->project->importTask);
-      common::printLink('task', 'create', "project=$project->id", $lang->task->create);
-      ?>
-    </div>
   </div>
 </div>
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php
index e68c0722de..500d46157d 100644
--- a/module/project/view/team.html.php
+++ b/module/project/view/team.html.php
@@ -12,38 +12,34 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/tablesorter.html.php';?>
-<div class='yui-d0'>
- <table align='center' class='table-4 tablesorter'>
-   <thead>
-   <tr class='colhead'>
-     <th><?php echo $lang->team->account;?></th>
-     <th><?php echo $lang->team->role;?></th>
-     <th><?php echo $lang->team->joinDate;?></th>
-     <th><?php echo $lang->team->workingHour;?></th>
-     <?php if(common::hasPriv('project', 'unlinkmember')) echo "<th>$lang->actions</th>";?>
-   </tr>
-   </thead>
-   <tbody>
-   <?php foreach($teamMembers as $member):?>
-   <tr class='a-center'>
-     <td>
-     <?php 
-     if(common::hasPriv('user', 'view')) echo html::a($this->createLink('user', 'view', "account=$member->account"), $member->realname);
-     else echo $member->realname;
-     ?>
-     </td>
-     <td><?php echo $member->role;?></td>
-     <td><?php echo substr($member->joinDate, 2);?></td>
-     <td><?php echo $member->workingHour;?></td>
-     <?php if(common::hasPriv('project', 'unlinkmember')) echo "<td>" . html::a($this->createLink('project', 'unlinkmember', "projectID=$project->id&account=$member->account"), $lang->project->unlinkMember, 'hiddenwin') . '</td>';?>
-   </tr>
-   <?php endforeach;?>
-   </tbody>     
-   <tfoot>
-   <tr><td colspan='5' class='a-right'><?php common::printLink('project', 'managemembers', "projectID=$project->id", $lang->project->manageMembers);?></td></tr>
-   </tfoot>
- </table>
- <div class='a-right'>
- </div>
-</div>
+<table align='center' class='table-4 tablesorter'>
+  <thead>
+  <tr class='colhead'>
+    <th><?php echo $lang->team->account;?></th>
+    <th><?php echo $lang->team->role;?></th>
+    <th><?php echo $lang->team->joinDate;?></th>
+    <th><?php echo $lang->team->workingHour;?></th>
+    <?php if(common::hasPriv('project', 'unlinkmember')) echo "<th>$lang->actions</th>";?>
+  </tr>
+  </thead>
+  <tbody>
+  <?php foreach($teamMembers as $member):?>
+  <tr class='a-center'>
+    <td>
+    <?php 
+    if(common::hasPriv('user', 'view')) echo html::a($this->createLink('user', 'view', "account=$member->account"), $member->realname);
+    else echo $member->realname;
+    ?>
+    </td>
+    <td><?php echo $member->role;?></td>
+    <td><?php echo substr($member->joinDate, 2);?></td>
+    <td><?php echo $member->workingHour;?></td>
+    <?php if(common::hasPriv('project', 'unlinkmember')) echo "<td>" . html::a($this->createLink('project', 'unlinkmember', "projectID=$project->id&account=$member->account"), $lang->project->unlinkMember, 'hiddenwin') . '</td>';?>
+  </tr>
+  <?php endforeach;?>
+  </tbody>     
+  <tfoot>
+  <tr><td colspan='5' class='a-right'><?php common::printLink('project', 'managemembers', "projectID=$project->id", $lang->project->manageMembers);?></td></tr>
+  </tfoot>
+</table>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/tips.html.php b/module/project/view/tips.html.php
index 845e009a0d..057e60ae6a 100644
--- a/module/project/view/tips.html.php
+++ b/module/project/view/tips.html.php
@@ -1,13 +1,11 @@
-<div class='yui-d0' style='margin-top:30px'>
-  <table align='center' class='table-3'> 
-    <caption><?php echo $lang->project->tips;?></caption>
-    <tr>
-      <td><?php echo $lang->project->afterInfo;?>
-      <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('project', 'team', "projectID=$projectID"), $lang->project->setTeam);?></div>
-      <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('project', 'linkstory', "projectID=$projectID"), $lang->project->linkStory);?></div>
-      <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('task', 'create', "project=$projectID"), $lang->project->createTask);?></div>
-      <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('project', 'task', "projectID=$projectID"), $lang->project->goback);?></div>
-      </td>
-    </tr>  
-  </table>
-</div>
+<table align='center' class='table-3' style='margin-top:30px'> 
+  <caption><?php echo $lang->project->tips;?></caption>
+  <tr>
+    <td><?php echo $lang->project->afterInfo;?>
+    <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('project', 'team', "projectID=$projectID"), $lang->project->setTeam);?></div>
+    <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('project', 'linkstory', "projectID=$projectID"), $lang->project->linkStory);?></div>
+    <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('task', 'create', "project=$projectID"), $lang->project->createTask);?></div>
+    <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('project', 'task', "projectID=$projectID"), $lang->project->goback);?></div>
+    </td>
+  </tr>  
+</table>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 0df8d5b4c6..809d40fa2c 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -11,84 +11,82 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<div class='yui-d0'>
-  <table align='center' class='table-1'>
-    <caption><?php echo $project->name;?></caption>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->name;?></th>
-      <td class='<?php if($project->deleted) echo 'deleted';?>'><?php echo $project->name;?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->code;?></th>
-      <td><?php echo $project->code;?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->beginAndEnd;?></th>
-      <td><?php echo $project->begin . ' ~ ' . $project->end;?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->goal;?></th>
-      <td class='content'><?php echo $project->goal;?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->desc;?></th>
-      <td class='content'><?php echo $project->desc;?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->status;?></th>
-      <td class='<?php echo $project->status;?>'><?php $lang->show($lang->project->statusList, $project->status);?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->PM;?></th>
-      <td><?php echo $users[$project->PM];?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->PO;?></th>
-      <td><?php echo $users[$project->PO];?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->QM;?></th>
-      <td><?php echo $users[$project->QM];?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->RM;?></th>
-      <td><?php echo $users[$project->RM];?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->lblStats;?></th>
-      <td><?php printf($lang->project->stats, $project->totalEstimate, $project->totalConsumed, $project->totalLeft, 10)?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->products;?></th>
-      <td>
-        <?php foreach($products as $productID => $productName) echo html::a($this->createLink('product', 'browse', "productID=$productID"), $productName) . '<br />';?>
-      </td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->acl;?></th>
-      <td><?php echo $lang->project->aclList[$project->acl];?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->whitelist;?></th>
-      <td>
-        <?php
-        $whitelist = explode(',', $project->whitelist);
-        foreach($whitelist as $groupID) if(isset($groups[$groupID])) echo $groups[$groupID] . '&nbsp;';
-        ?>
-      </td>
-    </tr>  
-  </table>
-  <div class='a-center f-16px strong'>
-  <?php
-  $browseLink = $this->session->projectList ? $this->session->projectList : inlink('task', "projectID=$project->id");
-  if(!$project->deleted)
-  {
-      common::printLink('project', 'edit',   "projectID=$project->id", $lang->project->edit);
-      common::printLink('project', 'delete', "projectID=$project->id", $lang->project->delete, 'hiddenwin');
-  }
-  echo html::a($browseLink, $lang->goback);
-  ?>
-  </div>
-  <?php include '../../common/view/action.html.php';?>
+<table align='center' class='table-1'>
+  <caption><?php echo $project->name;?></caption>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->name;?></th>
+    <td class='<?php if($project->deleted) echo 'deleted';?>'><?php echo $project->name;?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->code;?></th>
+    <td><?php echo $project->code;?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->beginAndEnd;?></th>
+    <td><?php echo $project->begin . ' ~ ' . $project->end;?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->goal;?></th>
+    <td class='content'><?php echo $project->goal;?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->desc;?></th>
+    <td class='content'><?php echo $project->desc;?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->status;?></th>
+    <td class='<?php echo $project->status;?>'><?php $lang->show($lang->project->statusList, $project->status);?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->PM;?></th>
+    <td><?php echo $users[$project->PM];?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->PO;?></th>
+    <td><?php echo $users[$project->PO];?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->QM;?></th>
+    <td><?php echo $users[$project->QM];?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->RM;?></th>
+    <td><?php echo $users[$project->RM];?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->lblStats;?></th>
+    <td><?php printf($lang->project->stats, $project->totalEstimate, $project->totalConsumed, $project->totalLeft, 10)?></td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->products;?></th>
+    <td>
+      <?php foreach($products as $productID => $productName) echo html::a($this->createLink('product', 'browse', "productID=$productID"), $productName) . '<br />';?>
+    </td>
+  </tr>
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->acl;?></th>
+    <td><?php echo $lang->project->aclList[$project->acl];?></td>
+  </tr>  
+  <tr>
+    <th class='rowhead'><?php echo $lang->project->whitelist;?></th>
+    <td>
+      <?php
+      $whitelist = explode(',', $project->whitelist);
+      foreach($whitelist as $groupID) if(isset($groups[$groupID])) echo $groups[$groupID] . '&nbsp;';
+      ?>
+    </td>
+  </tr>  
+</table>
+<div class='a-center f-16px strong'>
+<?php
+$browseLink = $this->session->projectList ? $this->session->projectList : inlink('task', "projectID=$project->id");
+if(!$project->deleted)
+{
+    common::printLink('project', 'edit',   "projectID=$project->id", $lang->project->edit);
+    common::printLink('project', 'delete', "projectID=$project->id", $lang->project->delete, 'hiddenwin');
+}
+echo html::a($browseLink, $lang->goback);
+?>
 </div>
+<?php include '../../common/view/action.html.php';?>
 <?php include '../../common/view/footer.html.php';?>