diff --git a/module/todo/css/view.css b/module/todo/css/view.css
index aff5b64dc7..41c18f1200 100644
--- a/module/todo/css/view.css
+++ b/module/todo/css/view.css
@@ -1 +1,2 @@
 #wrap .outer>table#actionbox>caption {margin-top:0px;}
+fieldset#commentBox{margin-bottom: 0;}
diff --git a/module/todo/view/assignto.html.php b/module/todo/view/assignto.html.php
index fa9710cfd4..9c5a8e58ed 100755
--- a/module/todo/view/assignto.html.php
+++ b/module/todo/view/assignto.html.php
@@ -30,8 +30,12 @@
               <th><?php echo $lang->todo->date;?></th>
               <td>
                 <div class='input-group'>
-                    <?php echo html::input('date', $date, "class='form-control form-date' id='todoDate'");?>
-                  <span class='input-group-addon'><input type='checkbox' name="future" id='switchDate' onclick='switchDateTodo(this);'> <?php echo $lang->todo->periods['future'];?></span>
+                  <?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>
               </td><td></td>
             </tr>
@@ -39,7 +43,7 @@
               <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"');?>
+                  <?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);' name="lblDisableDate"> <?php echo $lang->todo->lblDisableDate;?></td>
@@ -85,4 +89,5 @@
           $('#end').removeAttr('disabled').trigger('chosen:updated');
       }
   }
-</script>
\ No newline at end of file
+</script>
+<style>#end_chosen .chosen-single{border-left: none;}</style>