diff --git a/module/todo/view/assignto.html.php b/module/todo/view/assignto.html.php
index c0884812ab..23721e8ac1 100755
--- a/module/todo/view/assignto.html.php
+++ b/module/todo/view/assignto.html.php
@@ -28,25 +28,30 @@
             </tr>
             <tr>
               <th><?php echo $lang->todo->date;?></th>
+              <td><?php echo html::input('date', $date, "class='form-control form-date' id='todoDate'");?></td>
               <td>
-                <div class='input-group'>
-                  <?php echo html::input('date', $date, "class='form-control form-date' id='todoDate'");?>
-                  <span class='input-group-addon'>
-                    <label class='checkbox-inline'>
-                      <input type='checkbox' name="future" id='switchDate' onclick='switchDateTodo(this);'> <?php echo $lang->todo->periods['future'];?>
-                    </label>
-                  </span>
+                <div class='checkbox-primary'>
+                  <input type='checkbox' name="future" id='switchDate' onclick='switchDateTodo(this);' />
+                  <label for='switchDate'><?php echo $lang->todo->periods['future'];?></label>
                 </div>
-              </td><td></td>
+              </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 class='w-p50 pull-left'>
+                  <?php echo html::select('begin', $times, date('Y-m-d') != $date ? key($times) : $time, 'onchange=selectNext(); class="form-control chosen"');?>
+                </div>
+                <div class='w-p50 pull-left'>
+                  <?php echo html::select('end', $times, '', 'class="form-control chosen" margin-left:-1px"');?>
+                </div>
+              </td>
+              <td>
+                <div class='checkbox-primary'>
+                  <input type='checkbox' id='switchDate' onclick='switchDateFeature(this);' name="lblDisableDate">
+                  <label for='switchDate'><?php echo $lang->todo->lblDisableDate;?></label>
                 </div>
               </td>
-              <td><input type='checkbox' id='switchDate' onclick='switchDateFeature(this);' name="lblDisableDate"> <?php echo $lang->todo->lblDisableDate;?></td>
             </tr>
             <tfoot>
             <tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index 81c9faa221..e6b71a5bf2 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -49,41 +49,41 @@
           <th class='col-name required'><?php echo $lang->todo->name;?></th>
           <th class='col-desc<?php echo zget($visibleFields, 'desc', ' hidden');?>'><?php echo $lang->todo->desc;?></th>
           <th class='col-date<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
+          <th class='w-60px'></th>
         </tr>
       </thead>
       <tbody>
-      <?php $pri = 3;?>
-      <?php $time = $date != date('Y-m-d') ? key($times) : $time;?>
-      <?php for($i = 0; $i < $config->todo->batchCreate; $i++):?>
-      <tr class='text-left'>
-        <td class='col-id'><?php echo $i+1;?></td>
-        <td <?php echo zget($visibleFields, 'type', "class='hidden'")?> style='overflow:visible'><?php echo html::select("types[$i]", $lang->todo->typeList, '', "onchange='loadList(this.value, " . ($i + 1) . ")' class='form-control chosen'");?></td>
-        <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?> style='overflow:visible'><?php echo html::select("pris[$i]", $lang->todo->priList, $pri, "class='form-control chosen'");?></td>
-        <td style='overflow:visible'>
-          <div id='<?php echo "nameBox" . ($i+1);?>' class='hidden'><?php echo html::input("names[$i]", '', 'class="text-left form-control" autocomplete="off"');?></div>
-          <div class='<?php echo "nameBox" . ($i+1);?>'><?php echo html::input("names[$i]", '', 'class="text-left form-control" autocomplete="off"');?></div>
-        </td>
-        <td <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo html::textarea("descs[$i]", '', "rows='1' class='form-control'");?></td>
-        <td <?php echo zget($visibleFields, 'beginAndEnd', "class='hidden'")?> style='overflow:visible'>
-          <div class='input-group'>
-            <?php
-            echo html::select("begins[$i]", $times, $time, "onchange=\"setBeginsAndEnds($i, 'begin');\" class='form-control chosen control-time-begin'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));
-            echo '<span class="input-group-addon fix-border fix-padding"></span>';
-            echo html::select("ends[$i]", $times, '', "onchange=\"setBeginsAndEnds($i, 'end');\" class='form-control chosen control-time-end'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));
-            ?>
-            <span class='input-group-addon'>
-              <div class='checkbox-primary'>
-                <input type='checkbox' name="switchDate[<?php echo $i?>]" id="switchDate<?php echo $i?>" class='control-time-switch' onclick='switchDateList(<?php echo $i?>);' />
-                <label for="switchDate<?php echo $i?>"> <?php echo $lang->todo->periods['future'];?></label>
-              </div>
-            </span>
-          </div>
-        </td>
-      </tr>  
-      <?php endfor;?>
+        <?php $pri = 3;?>
+        <?php $time = $date != date('Y-m-d') ? key($times) : $time;?>
+        <?php for($i = 0; $i < $config->todo->batchCreate; $i++):?>
+        <tr class='text-left'>
+          <td class='col-id'><?php echo $i+1;?></td>
+          <td <?php echo zget($visibleFields, 'type', "class='hidden'")?> style='overflow:visible'><?php echo html::select("types[$i]", $lang->todo->typeList, '', "onchange='loadList(this.value, " . ($i + 1) . ")' class='form-control chosen'");?></td>
+          <td <?php echo zget($visibleFields, 'pri', "class='hidden'")?> style='overflow:visible'><?php echo html::select("pris[$i]", $lang->todo->priList, $pri, "class='form-control chosen'");?></td>
+          <td style='overflow:visible'>
+            <div id='<?php echo "nameBox" . ($i+1);?>' class='hidden'><?php echo html::input("names[$i]", '', 'class="text-left form-control" autocomplete="off"');?></div>
+            <div class='<?php echo "nameBox" . ($i+1);?>'><?php echo html::input("names[$i]", '', 'class="text-left form-control" autocomplete="off"');?></div>
+          </td>
+          <td <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo html::textarea("descs[$i]", '', "rows='1' class='form-control'");?></td>
+          <td <?php echo zget($visibleFields, 'beginAndEnd', "class='hidden'")?> style='overflow:visible'>
+            <div class='w-p50 pull-left'>
+              <?php echo html::select("begins[$i]", $times, $time, "onchange=\"setBeginsAndEnds($i, 'begin');\" class='form-control chosen control-time-begin'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));?>
+            </div>
+            <div class='w-p50 pull-left'>
+              <?php echo html::select("ends[$i]", $times, '', "onchange=\"setBeginsAndEnds($i, 'end');\" class='form-control chosen control-time-end'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));?>
+            </div>
+          </td>
+          <td <?php echo zget($visibleFields, 'beginAndEnd', "class='hidden'")?> style='overflow:visible'>
+            <div class='checkbox-primary'>
+              <input type='checkbox' name="switchDate[<?php echo $i?>]" id="switchDate<?php echo $i?>" class='control-time-switch' onclick='switchDateList(<?php echo $i?>);' />
+              <label for="switchDate<?php echo $i?>"> <?php echo $lang->todo->periods['future'];?></label>
+            </div>
+          </td>
+        </tr>
+        <?php endfor;?>
       </tbody>
       <tfoot>
-        <tr><td class='text-center' colspan='<?php echo $columns?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
+        <tr><td class='text-center' colspan='<?php echo isset($visibleFields['beginAndEnd']) ? $columns + 1 : $columns;?>'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide');?></td></tr>
       </tfoot>
     </table>
     <div class="hidden">