diff --git a/module/file/view/download.html.php b/module/file/view/download.html.php
index 3b913a9917..ee649ef236 100644
--- a/module/file/view/download.html.php
+++ b/module/file/view/download.html.php
@@ -23,7 +23,7 @@
     $fileContent = file_get_contents($file->realPath);
     if($charset != $config->charset)
     {
-        $fileContent = helper::convertEncoding($fileContent, $charset, $config->charset);
+        $fileContent = helper::convertEncoding($fileContent, $charset . "//IGNORE", $config->charset);
     }
     else
     {
diff --git a/module/testtask/js/common.js b/module/testtask/js/common.js
index 63032b82b1..fcee896bf6 100644
--- a/module/testtask/js/common.js
+++ b/module/testtask/js/common.js
@@ -20,3 +20,11 @@ $(document).ready(function()
         }
     });
 })
+
+function adjustPriBoxWidth()
+{
+    var boxWidth   = $('#ownerAndPriBox').width();
+    var beginWidth = $("input[name='begin']").outerWidth();
+    var addonWidth = $('#ownerAndPriBox .input-group-addon').outerWidth();
+    $('#pri,#pri_chosen .chosen-single').css('width', boxWidth - beginWidth -addonWidth);
+}
diff --git a/module/testtask/js/create.js b/module/testtask/js/create.js
index 637c69a1d4..2d2f0f5c45 100755
--- a/module/testtask/js/create.js
+++ b/module/testtask/js/create.js
@@ -61,5 +61,5 @@ function suitEndDate()
 /* If the mouse hover over the manage contacts button, give tip. */
 $(function()
 {
-    $('[data-toggle=tooltip]').tooltip();
+    adjustPriBoxWidth();
 });
diff --git a/module/testtask/js/edit.js b/module/testtask/js/edit.js
index ae6af5abce..c312df3585 100755
--- a/module/testtask/js/edit.js
+++ b/module/testtask/js/edit.js
@@ -27,12 +27,5 @@ function loadProjectBuilds(projectID)
 
 $(function()
 {
-    var adjustPriBoxWidth = function()
-    {
-        var boxWidth   = $('#ownerAndPriBox').width();
-        var beginWidth = $("input[name='begin']").outerWidth();
-        var addonWidth = $('#ownerAndPriBox .input-group-addon').outerWidth();
-        $('#pri').css('width', boxWidth - beginWidth -addonWidth);
-    };
-    adjustPriBoxWidth();//Adjust testtask pri box width.
+    adjustPriBoxWidth();
 })
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index a968fcb883..e0630e34e4 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -14,80 +14,83 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<div class='container mw-1400px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['testtask']);?></span>
-      <strong><small class='text-muted'><?php echo html::icon($lang->icons['create']);?></small> <?php echo $lang->testtask->create;?></strong>
+<div id='mainContent' class='main-content'>
+  <div class='center-block mw-1400px'>
+    <div class='main-header'>
+      <h2><?php echo $lang->testtask->create;?></h2>
     </div>
+    <form method='post' target='hiddenwin' id='dataform'>
+      <table class='table table-form'>
+        <?php if(isset($projectID)):?>
+        <tr>
+          <th class='w-80px'><?php echo $lang->testtask->product;?></th>
+          <td class='w-p35-f'><?php echo html::select('product', $products, $productID, "class='form-control chosen'");?></td><td></td>
+        </tr>
+        <?php else:?>
+        <tr class='hide'>
+          <th class='w-80px'><?php echo $lang->testtask->product;?></th>
+          <td class='w-p35-f'><?php echo html::input('product', $productID, "class='form-control'");?></td><td></td>
+        </tr>
+        <?php endif;?>
+        <?php if($this->config->global->flow != 'onlyTest'):?>
+        <tr>
+          <th class='w-80px'><?php echo $lang->testtask->project;?></th>
+          <td class='w-p35-f'><?php echo html::select('project', $projects, '', "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?></td><td></td>
+        </tr>
+        <?php endif;?>
+        <tr>
+          <th class='w-80px'><?php echo $lang->testtask->build;?></th>
+          <td class='w-p35-f'><span id='buildBox'><?php echo html::select('build', $builds, $build, "class='form-control chosen'");?></span></td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->owner;?></th>
+          <td>
+            <div id='ownerAndPriBox' class='input-group'>
+              <?php echo html::select('owner', $users, '', "class='form-control chosen'");?>
+              <span class='input-group-addon fix-border'><?php echo $lang->testtask->pri;?></span>
+              <?php echo html::select('pri', $lang->testtask->priList, 0, "class='form-control chosen'");?>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->begin;?></th>
+          <td>
+            <div class='input-group'>
+              <?php echo html::input('begin', '', "class='form-control form-date' onchange='suitEndDate()'");?>
+              <span class='input-group-addon fix-border'><?php echo $lang->testtask->end;?></span>
+              <?php echo html::input('end', '', "class='form-control form-date'");?>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->status;?></th>
+          <td><?php echo html::select('status', $lang->testtask->statusList, '',  "class='form-control chosen'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->name;?></th>
+          <td colspan='2'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->desc;?></th>
+          <td colspan='2'><?php echo html::textarea('desc', '', "rows=10 class='form-control'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->mailto;?></th>
+          <td colspan='2'>
+            <div id='mailtoGroup' class='input-group'>
+            <?php
+            echo html::select('mailto[]', $users, '', "multiple class='form-control'");
+            echo $this->fetch('my', 'buildContactLists');
+            ?>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td></td><td colspan='2'><?php echo html::submitButton() . html::backButton();?> </td>
+        </tr>
+      </table>
+    </form>
   </div>
-  <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-    <table class='table table-form'> 
-      <?php if(isset($projectID)):?>
-      <tr>
-        <th class='w-90px'><?php echo $lang->testtask->product;?></th>
-        <td class='w-p25-f'><?php echo html::select('product', $products, $productID, "class='form-control chosen'");?></td><td></td>
-      </tr>  
-      <?php else:?>
-      <tr class='hide'>
-        <th class='w-90px'><?php echo $lang->testtask->product;?></th>
-        <td class='w-p25-f'><?php echo html::input('product', $productID, "class='form-control'");?></td><td></td>
-      </tr>  
-      <?php endif;?>
-      <?php if($this->config->global->flow != 'onlyTest'):?>
-      <tr>
-        <th class='w-90px'><?php echo $lang->testtask->project;?></th>
-        <td class='w-p25-f'><?php echo html::select('project', $projects, '', "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?></td><td></td>
-      </tr>  
-      <?php endif;?>
-      <tr>
-        <th class='w-90px'><?php echo $lang->testtask->build;?></th>
-        <td class='w-p25-f'><span id='buildBox'><?php echo html::select('build', $builds, $build, "class='form-control chosen'");?></span></td>
-        <td></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->testtask->owner;?></th>
-        <td><?php echo html::select('owner', $users, '', "class='form-control chosen'");?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->testtask->pri;?></th>
-        <td><?php echo html::select('pri', $lang->testtask->priList, 0, "class='form-control'");?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->testtask->begin;?></th>
-        <td><?php echo html::input('begin', '', "class='form-control form-date' onchange='suitEndDate()'");?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->testtask->end;?></th>
-        <td><?php echo html::input('end', '', "class='form-control form-date'");?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->testtask->status;?></th>
-        <td><?php echo html::select('status', $lang->testtask->statusList, '',  "class='form-control'");?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->testtask->name;?></th>
-        <td colspan='2'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->testtask->desc;?></th>
-        <td colspan='2'><?php echo html::textarea('desc', '', "rows=10 class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testtask->mailto;?></th>
-        <td colspan='2'>
-          <div id='mailtoGroup' class='input-group'>
-          <?php
-          echo html::select('mailto[]', $users, '', "multiple class='form-control'");
-          echo $this->fetch('my', 'buildContactLists');
-          ?>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td></td><td colspan='2'><?php echo html::submitButton() . html::backButton();?> </td>
-      </tr>
-    </table>
-  </form>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 81508e6115..705a3ebba8 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -13,75 +13,76 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div class='container mw-1400px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix' title='TESTTASK'><?php echo html::icon($lang->icons['testtask']);?></span>
-      <strong><?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $task->id), $task->name, '_blank');?></strong>
-      <small class='text-muted'> <?php echo $lang->testtask->edit;?> <?php echo html::icon($lang->icons['edit']);?></small>
+<div id='mainContent' class='main-content'>
+  <div class='center-block mw-1400px'>
+    <div class='main-header'>
+      <h2>
+        <?php echo html::a($this->createLink('testtask', 'view', 'taskID=' . $task->id), $task->name, '_blank');?>
+        <small class='text-muted'><?php echo $lang->arrow . $lang->testtask->edit;?></small>
+      </h2>
     </div>
+    <form method='post' target='hiddenwin' id='dataform'>
+      <table class='table table-form'> 
+        <?php if($this->config->global->flow != 'onlyTest'):?>
+        <tr>
+          <th class='w-80px'><?php echo $lang->testtask->project;?></th>
+          <td class='w-p35-f'>
+            <?php echo html::select('project', $projects, $task->project, "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?>
+          </td>
+          <td></td>
+        </tr>
+        <?php endif;?>
+        <tr>
+          <th class='w-80px'><?php echo $lang->testtask->build;?></th>
+          <td class='w-p35-f'><span id='buildBox'><?php echo html::select('build', $builds, $task->build, "class='form-control chosen'");?></span></td>
+          <td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->owner;?></th>
+          <td>
+            <div id='ownerAndPriBox' class='input-group'>
+              <?php echo html::select('owner', $users, $task->owner, "class='form-control chosen'");?>
+              <span class='input-group-addon fix-border'><?php echo $lang->testtask->pri;?></span>
+              <?php echo html::select('pri', $lang->testtask->priList, $task->pri, "class='form-control chosen'");?>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->begin;?></th>
+          <td>
+            <div class='input-group'>
+              <?php echo html::input('begin', $task->begin, "class='form-control form-date'");?>
+              <span class='input-group-addon fix-border'><?php echo $lang->testtask->end;?></span>
+              <?php echo html::input('end', $task->end, "class='form-control form-date'");?>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->status;?></th>
+          <td><?php echo html::select('status', $lang->testtask->statusList, $task->status,  "class='form-control chosen'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->name;?></th>
+          <td colspan='2'><?php echo html::input('name', $task->name, "class='form-control' autocomplete='off'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->desc;?></th>
+          <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows=10 class='form-control'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->testtask->mailto;?></th>
+          <td colspan='2'>
+            <div class='input-group'>
+              <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $task->mailto), "multiple class='form-control'");?>
+              <?php if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");?>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td></td><td colspan='2'><?php echo html::submitButton() . html::backButton() . html::hidden('product', $task->product);?></td>
+        </tr>
+      </table>
+    </form>
   </div>
-  <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-    <table class='table table-form'> 
-      <?php if($this->config->global->flow != 'onlyTest'):?>
-      <tr>
-        <th class='w-80px'><?php echo $lang->testtask->project;?></th>
-        <td class='w-p35-f'>
-          <?php echo html::select('project', $projects, $task->project, "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?>
-        </td>
-        <td></td>
-      </tr>
-      <?php endif;?>
-      <tr>
-        <th class='w-80px'><?php echo $lang->testtask->build;?></th>
-        <td class='w-p35-f'><span id='buildBox'><?php echo html::select('build', $builds, $task->build, "class='form-control chosen'");?></span></td>
-        <td></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testtask->owner;?></th>
-        <td>
-          <div id='ownerAndPriBox' class='input-group'>
-            <?php echo html::select('owner', $users, $task->owner, "class='form-control chosen'");?>
-            <span class='input-group-addon fix-border'><?php echo $lang->testtask->pri;?></span>
-            <?php echo html::select('pri', $lang->testtask->priList, $task->pri, "class='form-control'");?>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testtask->begin;?></th>
-        <td>
-          <div class='input-group'>
-            <?php echo html::input('begin', $task->begin, "class='form-control form-date'");?>
-            <span class='input-group-addon fix-border'><?php echo $lang->testtask->end;?></span>
-            <?php echo html::input('end', $task->end, "class='form-control form-date'");?>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testtask->status;?></th>
-        <td><?php echo html::select('status', $lang->testtask->statusList, $task->status,  "class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testtask->name;?></th>
-        <td colspan='2'><?php echo html::input('name', $task->name, "class='form-control' autocomplete='off'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testtask->desc;?></th>
-        <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($task->desc), "rows=10 class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->testtask->mailto;?></th>
-        <td colspan='2'>
-          <div class='input-group'>
-            <?php echo html::select('mailto[]', $users, str_replace(' ' , '', $task->mailto), "multiple class='form-control'");?>
-            <?php if($contactLists) echo html::select('', $contactLists, '', "class='form-control chosen' onchange=\"setMailto('mailto', this.value)\"");?>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td></td><td colspan='2'><?php echo html::submitButton() . html::backButton() . html::hidden('product', $task->product);?></td>
-      </tr>
-    </table>
-  </form>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/todo/css/create.css b/module/todo/css/create.css
index d2f9f434f0..2a9a6facd0 100644
--- a/module/todo/css/create.css
+++ b/module/todo/css/create.css
@@ -1,3 +1,5 @@
 #begin_chosen{width:50% !important;}
 .switchDate{border-left: none;}
 #end_chosen .chosen-single{border-left: none;}
+.cycleConfig .checkbox-primary{float:left; width:100px;}
+.cycleConfig .tab-pane{padding:8px 0px;}
diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php
index 42c1054f96..44ff2e67b4 100644
--- a/module/todo/view/create.html.php
+++ b/module/todo/view/create.html.php
@@ -14,112 +14,131 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('noTodo', $lang->todo->noTodo);?>
-<div class='container mw-1400px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['todo']);?></span>
-      <strong><small class='text-muted'><?php echo html::icon($lang->icons['create']);?></small> <?php echo $lang->todo->create;?></strong>
+<div id='mainContent' class='main-content'>
+  <div class='center-block mw-1400px'>
+    <div class='main-header'>
+      <h2><?php echo $lang->todo->create;?></h2>
     </div>
-  </div>
-  <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-    <table class='table table-form'> 
-      <tr>
-        <th class='w-80px'><?php echo $lang->todo->date;?></th>
-        <td class='w-p25-f'>
-          <div class='input-group'>
-            <?php echo html::input('date', $date, "class='form-control form-date'");?>
-            <span class='input-group-addon switchDate'><input type='checkbox' id='switchDate' onclick='switchDateTodo(this);'> <?php echo $lang->todo->periods['future'];?></span>
-            <span class='input-group-addon'><input type='checkbox' id='cycle' name='cycle' value='1'> <?php echo $lang->todo->cycle;?></span>
-          </div>
-        </td><td></td>
-      </tr>
-      <tr class='cycleConfig hidden'>
-        <th><?php echo $lang->todo->cycleConfig;?></th>
-        <td colspan='2'>
-          <ul class="nav nav-tabs">
-          <li class="active"><a data-tab data-type='day' href="#day"><?php echo $lang->todo->cycleDay;?></a></li>
-            <li><a data-tab data-type='week' href="#week"><?php echo $lang->todo->cycleWeek;?></a></li>
-            <li><a data-tab data-type='month' href="#month"><?php echo $lang->todo->cycleMonth;?></a></li>
-          </ul>
-          <div class="tab-content">
-            <div class="tab-pane active" id="day">
-              <div class='input-group w-150px'>
-                <span class='input-group-addon'><?php echo $lang->todo->every;?></span>
-                <?php echo html::input('config[day]', 1, "class='form-control'")?>
-                <span class='input-group-addon'><?php echo $lang->todo->cycleDay;?></span>
+    <form method='post' target='hiddenwin' id='dataform'>
+      <table class='table table-form'> 
+        <tr>
+          <th class='w-80px'><?php echo $lang->todo->date;?></th>
+          <td class='w-p25-f'>
+            <div class='input-group'>
+              <?php echo html::input('date', $date, "class='form-control form-date'");?>
+              <span class='input-group-addon switchDate'>
+                <div class='checkbox-primary'>
+                  <input type='checkbox' id='switchDate' onclick='switchDateTodo(this);' />
+                  <label for='switchDate'><?php echo $lang->todo->periods['future'];?></label>
+                </div>
+              </span>
+              <span class='input-group-addon'>
+                <div class='checkbox-primary'>
+                  <input type='checkbox' id='cycle' name='cycle' value='1' />
+                  <label for='cycle'><?php echo $lang->todo->cycle;?></label>
+                </div>
+              </span>
+            </div>
+          </td><td></td>
+        </tr>
+        <tr class='cycleConfig hidden'>
+          <th><?php echo $lang->todo->cycleConfig;?></th>
+          <td colspan='2'>
+            <ul class="nav nav-tabs">
+            <li class="active"><a data-tab data-type='day' href="#day"><?php echo $lang->todo->cycleDay;?></a></li>
+              <li><a data-tab data-type='week' href="#week"><?php echo $lang->todo->cycleWeek;?></a></li>
+              <li><a data-tab data-type='month' href="#month"><?php echo $lang->todo->cycleMonth;?></a></li>
+            </ul>
+            <div class="tab-content">
+              <div class="tab-pane active" id="day">
+                <div class='input-group w-150px'>
+                  <span class='input-group-addon'><?php echo $lang->todo->every;?></span>
+                  <?php echo html::input('config[day]', 1, "class='form-control'")?>
+                  <span class='input-group-addon'><?php echo $lang->todo->cycleDay;?></span>
+                </div>
+              </div>
+              <div class="tab-pane clearfix" id="week">
+                <?php echo html::checkbox('config[week]', $lang->todo->dayNames)?>
+              </div>
+              <div class="tab-pane clearfix" id="month">
+                <?php
+                $days = array();
+                for($i = 1; $i <= 10; $i ++) $days[$i] = $i;
+                echo html::checkbox('config[month]', $days);
+                $days = array();
+                for($i = 11; $i <= 20; $i ++) $days[$i] = $i;
+                echo html::checkbox('config[month]', $days);
+                $days = array();
+                for($i = 21; $i <= 31; $i ++) $days[$i] = $i;
+                echo html::checkbox('config[month]', $days);
+                ?>
               </div>
             </div>
-            <div class="tab-pane" id="week">
-              <?php echo html::checkbox('config[week]', $lang->todo->dayNames)?>
+            <?php echo html::hidden('config[type]', 'day')?>
+            <div class='input-group' style='width:200px; padding-top:5px;'>
+            <?php printf($lang->todo->beforeDays, html::input('config[beforeDays]', 0, "class='form-control'"));?>
             </div>
-            <div class="tab-pane" id="month">
-              <?php
-              $days = array();
-              for($i = 1; $i <= 10; $i ++) $days[$i] = $i;
-              echo "<p class='box1-10'>" . html::checkbox('config[month]', $days) . '</p>';
-              $days = array();
-              for($i = 11; $i <= 20; $i ++) $days[$i] = $i;
-              echo "<p class='box11-20'>" . html::checkbox('config[month]', $days) . '</p>';
-              $days = array();
-              for($i = 21; $i <= 31; $i ++) $days[$i] = $i;
-              echo "<p class='box21-31'>" . html::checkbox('config[month]', $days) . '</p>';
-              ?>
+          </td>
+        </tr>  
+        <tr class='cycleConfig hidden'>
+          <th><?php echo $lang->todo->deadline;?></th>
+          <td><?php echo html::input("config[end]", '', "class='form-control form-date'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->todo->type;?></th>
+          <td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange=loadList(this.value); class=form-control');?></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->pri;?></th>
+          <td><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control chosen'");?></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->name;?></th>
+          <td colspan='2'>
+            <div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
+            <div class='nameBox'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
+          </td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->desc;?></th>
+          <td colspan='2'><?php echo html::textarea('desc', '', "rows='8' class='form-control'");?></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->status;?></th>
+          <td><?php echo html::select('status', $lang->todo->statusList, '', "class='form-control chosen'");?></td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->beginAndEnd;?></th>
+          <td>
+            <div class='input-group'>
+              <?php echo html::select('begin', $times, date('Y-m-d') != $date ? key($times) : $time, 'onchange=selectNext(); class="form-control chosen" style="width: 50%;"') . html::select('end', $times, '', 'class="form-control chosen" style="width: 50%; margin-left:-1px"');?>
             </div>
-          </div>
-          <?php echo html::hidden('config[type]', 'day')?>
-          <div class='input-group' style='width:200px; padding-top:5px;'>
-          <?php printf($lang->todo->beforeDays, html::input('config[beforeDays]', 0, "class='form-control'"));?>
-          </div>
-        </td>
-      </tr>  
-      <tr class='cycleConfig hidden'>
-        <th><?php echo $lang->todo->deadline;?></th>
-        <td><?php echo html::input("config[end]", '', "class='form-control form-date'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->todo->type;?></th>
-        <td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange=loadList(this.value); class=form-control');?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->todo->pri;?></th>
-        <td><?php echo html::select('pri', $lang->todo->priList, '', "class='form-control chosen'");?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->todo->name;?></th>
-        <td colspan='2'>
-          <div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
-          <div class='nameBox'><?php echo html::input('name', '', "class='form-control' autocomplete='off'");?></div>
-        </td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->todo->desc;?></th>
-        <td colspan='2'><?php echo html::textarea('desc', '', "rows='8' class='form-control'");?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->todo->status;?></th>
-        <td><?php echo html::select('status', $lang->todo->statusList, '', "class='form-control chosen'");?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->todo->beginAndEnd;?></th>
-        <td>
-          <div class='input-group'>
-            <?php echo html::select('begin', $times, date('Y-m-d') != $date ? key($times) : $time, 'onchange=selectNext(); class="form-control chosen" style="width: 50%;"') . html::select('end', $times, '', 'class="form-control chosen" style="width: 50%; margin-left:-1px"');?>
-          </div>
-        </td>
-        <td><input type='checkbox' id='switchDate' onclick='switchDateFeature(this);'> <?php echo $lang->todo->lblDisableDate;?></td>
-      </tr>  
-      <tr>
-        <th><?php echo $lang->todo->private;?></th>
-        <td><input type='checkbox' name='private' id='private' value='1'></td>
-      </tr>  
-      <tr>
-        <td></td>
-        <td colspan='2' class='text-center'>
-          <?php echo html::submitButton() . html::backButton();?>
-        </td>
-      </tr>
-    </table>
-  </form>
+          </td>
+          <td>
+            <div class='checkbox-primary'>
+              <input type='checkbox' id='switchDate' onclick='switchDateFeature(this);' />
+              <label for='switchDate'><?php echo $lang->todo->lblDisableDate;?></label>
+            </div>
+          </td>
+        </tr>  
+        <tr>
+          <th><?php echo $lang->todo->private;?></th>
+          <td>
+            <div class='checkbox-primary'>
+              <input type='checkbox' name='private' id='private' value='1' />
+              <label for='private'></label>
+            </div>
+          </td>
+        </tr>  
+        <tr>
+          <td></td>
+          <td colspan='2' class='text-center'>
+            <?php echo html::submitButton() . html::backButton();?>
+          </td>
+        </tr>
+      </table>
+    </form>
+  </div>
 </div>
 
 <script language='Javascript'>