diff --git a/module/todo/css/batchcreate.css b/module/todo/css/batchcreate.css
index 131aa4be2a..98dcab5e0c 100755
--- a/module/todo/css/batchcreate.css
+++ b/module/todo/css/batchcreate.css
@@ -1,7 +1,10 @@
 #datepicker {position: relative; top: -6px; margin-left: 10px;}
+#datepicker .input-group-addon input[type="checkbox"]{vertical-align: middle; top: -4px; margin-left: -15px;}
 .input-group > .form-control:first-child {border-right: 0}
 
 .body-modal .outer > form, .body-modal .outer > .container > form {margin: 0;padding: 0 20px 20px;}
 .body-modal #titlebar {margin: 0 -20px 20px}
 .body-modal #titlebar + .table-form {border: 1px solid #ddd}
 #titlebar input#date{background:#F8FAFE;box-shadow:none}
+
+div[id*="ends"] .chosen-single{border-left: none;}
diff --git a/module/todo/css/batchedit.css b/module/todo/css/batchedit.css
index f1f56755ce..b0b43d1779 100644
--- a/module/todo/css/batchedit.css
+++ b/module/todo/css/batchedit.css
@@ -1 +1,3 @@
 .input-group > .form-control:first-child {border-right: 0}
+
+div[id*="ends"] .chosen-single{border-left: none;}
diff --git a/module/todo/view/batchcreate.html.php b/module/todo/view/batchcreate.html.php
index f9c86082cd..536928b6fa 100755
--- a/module/todo/view/batchcreate.html.php
+++ b/module/todo/view/batchcreate.html.php
@@ -20,7 +20,11 @@
       <div class='input-group w-200px pull-left' id='datepicker'>
         <span class='input-group-addon'><?php echo $lang->todo->date;?></span>
         <?php echo html::input('date', $date, "class='form-control form-date' style='width:90px;' onchange='updateAction(this.value)'");?>
-        <span class='input-group-addon'><input type='checkbox' id='switchDate' onclick='switchDateTodo(this);'> <?php echo $lang->todo->periods['future'];?></span>
+        <span class='input-group-addon'>
+          <label class='checkbox-inline'>
+            <input type='checkbox' id='switchDate' onclick='switchDateTodo(this);'> <?php echo $lang->todo->periods['future'];?>
+          </label>
+        </span>
       </div>
       <div class='actions'>
         <button type="button" class="btn btn-default" data-toggle="customModal"><i class='icon icon-cog'></i> </button>
@@ -64,7 +68,11 @@
           echo html::select("begins[$i]", $times, $time, "onchange=\"setBeginsAndEnds($i, 'begin');\" class='form-control chosen' style='width: 50%'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));
           echo html::select("ends[$i]", $times, '', "onchange=\"setBeginsAndEnds($i, 'end');\" class='form-control chosen' style='width: 50%'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));
           ?>
-          <span class='input-group-addon'><input type='checkbox' name="switchDate[<?php echo $i?>]" id="switchDate<?php echo $i?>" onclick='switchDateList(<?php echo $i?>);'><?php echo $lang->todo->periods['future'];?></span>
+          <span class='input-group-addon'>
+            <label class='checkbox-inline'>
+              <input type='checkbox' name="switchDate[<?php echo $i?>]" id="switchDate<?php echo $i?>" onclick='switchDateList(<?php echo $i?>);'> <?php echo $lang->todo->periods['future'];?>
+            </label>
+          </span>
         </div>
       </td>
     </tr>  
diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php
index a90d738a6b..4a8f58ca14 100644
--- a/module/todo/view/batchedit.html.php
+++ b/module/todo/view/batchedit.html.php
@@ -30,7 +30,7 @@ foreach(explode(',', $showFields) as $field)
 {
     if($field)$visibleFields[$field] = '';
 }
-$columns = count($visibleFields) + 3;
+$columns = count($visibleFields) + 4;
 ?>
 <form class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->inlink('batchEdit', "from=todoBatchEdit");?>'>
   <table class='table table-form table-fixed with-border'>
@@ -51,7 +51,10 @@ $columns = count($visibleFields) + 3;
     <tr class='text-left'>
       <td><?php echo $todo->id . html::hidden("todoIDList[$todo->id]", $todo->id);?></td>
       <td><?php echo html::input("dates[$todo->id]", $todo->date, "class='form-control form-date'");?></td>
-      <td class='text-center'><?php echo zget($lang->todo->typeList, $todo->type);?></td>
+      <td class='text-center'>
+        <?php echo zget($lang->todo->typeList, $todo->type);?>
+        <?php echo html::hidden("types[$todo->id]", $todo->type);?>
+      </td>
       <td style='overflow:visible' <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$todo->id]", $lang->todo->priList, $todo->pri, "class='form-control chosen'");?></td>
       <td style='overflow:visible'>
         <div id='<?php echo "nameBox" . $todo->id;?>' class='hidden'><? echo html::input("names[$todo->id]", '', "class='text-left form-control hiddenwin' autocomplete='off'"); ?></div>