diff --git a/module/user/css/common.css b/module/user/css/common.css
index d9e2137ab6..b7355c499c 100644
--- a/module/user/css/common.css
+++ b/module/user/css/common.css
@@ -1,3 +1,2 @@
-.cont-lt1 .side {width: 120px;}
-.cont-lt1 .side .box-title{padding: 3px;}
-.side .box-content a {padding-left:5px}
+.todoheader {margin-bottom:5px;}
+.todoheader .active{color:#009900; font-weight:bold;}
diff --git a/module/user/view/todo.html.php b/module/user/view/todo.html.php
index 39af7415f1..832322f28a 100644
--- a/module/user/view/todo.html.php
+++ b/module/user/view/todo.html.php
@@ -14,56 +14,51 @@
 <?php include "../../common/view/datepicker.html.php"; ?>
 <?php include './featurebar.html.php';?>
 <script language='Javascript'>var account='<?php echo $account;?>'</script>
-<table class='cont-lt1'>
-  <tr valign='top'>
-    <td class='side'>
-      <div class='box-title'><?php echo $lang->user->todo; ?></div>
-      <div class='box-content'>
-        <?php 
-        foreach($lang->todo->periods as $period => $label)
-        {
-            $vars = "account={$app->user->account}&date=$period";
-            if($period == 'before') $vars .= "&status=undone";
-            echo "<span id='$period'>" . html::a(inlink('todo', $vars), $label) . '</span><br />';
-        }
-        ?>
-      </div>
-    </td>
-    <td class='divider'></td>
-    <td>
-      <form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform'>
-        <table class='table-1 tablesorter'>
-          <?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
-          <thead>
-          <tr class='colhead'>
-            <th class='w-id'>    <?php common::printOrderLink('id',     $orderBy, $vars, $lang->idAB);?></th>
-            <th class='w-date'>  <?php common::printOrderLink('date',   $orderBy, $vars, $lang->todo->date);?></th>
-            <th class='w-type'>  <?php common::printOrderLink('type',   $orderBy, $vars, $lang->todo->type);?></th>
-            <th class='w-pri'>   <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
-            <th>                 <?php common::printOrderLink('name',   $orderBy, $vars, $lang->todo->name);?></th>
-            <th class='w-hour'>  <?php common::printOrderLink('begin',  $orderBy, $vars, $lang->todo->beginAB);?></th>
-            <th class='w-hour'>  <?php common::printOrderLink('end',    $orderBy, $vars, $lang->todo->endAB);?></th>
-            <th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
-          </tr>
-          </thead>
-          <tbody>
-          <?php foreach($todos as $todo):?>
-          <tr class='a-center'>
-            <td><?php echo $todo->id;?></td>
-            <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
-            <td><?php echo $lang->todo->typeList[$todo->type];?></td>
-            <td><span class='<?php echo 'pri' . $todo->pri;?>'><?php echo $todo->pri?></span></td>
-            <td class='a-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id", '', true), $todo->name, '', "class='colorbox'");?></td>
-            <td><?php echo $todo->begin;?></td>
-            <td><?php echo $todo->end;?></td>
-            <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
-          </tr>
-          <?php endforeach;?>
-          </tbody>
-          <tfoot><tr><td colspan='8'><?php $pager->show();?></td></tr></tfoot>
-        </table>
-      </form>
-    </td>
-  </tr>
-</table>
+<div class='todoheader'>
+  <?php 
+  foreach($lang->todo->periods as $period => $label)
+  {
+      $vars = "account={$app->user->account}&date=$period";
+      if($period == 'before') $vars .= "&status=undone";
+      echo "<span id='$period'>" . html::a(inlink('todo', $vars), $label) . '</span> ';
+  }
+  ?>
+</div>
+<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform'>
+  <table class='table-1 tablesorter'>
+    <?php $vars = "type=$type&account=$account&status=$status&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"; ?>
+    <thead>
+    <tr class='colhead'>
+      <th class='w-id'>    <?php common::printOrderLink('id',     $orderBy, $vars, $lang->idAB);?></th>
+      <th class='w-date'>  <?php common::printOrderLink('date',   $orderBy, $vars, $lang->todo->date);?></th>
+      <th class='w-type'>  <?php common::printOrderLink('type',   $orderBy, $vars, $lang->todo->type);?></th>
+      <th class='w-pri'>   <?php common::printOrderLink('pri',    $orderBy, $vars, $lang->priAB);?></th>
+      <th>                 <?php common::printOrderLink('name',   $orderBy, $vars, $lang->todo->name);?></th>
+      <th class='w-hour'>  <?php common::printOrderLink('begin',  $orderBy, $vars, $lang->todo->beginAB);?></th>
+      <th class='w-hour'>  <?php common::printOrderLink('end',    $orderBy, $vars, $lang->todo->endAB);?></th>
+      <th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->todo->status);?></th>
+    </tr>
+    </thead>
+    <tbody>
+    <?php foreach($todos as $todo):?>
+    <tr class='a-center'>
+      <td><?php echo $todo->id;?></td>
+      <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
+      <td><?php echo $lang->todo->typeList[$todo->type];?></td>
+      <td><span class='<?php echo 'pri' . $todo->pri;?>'><?php echo $todo->pri?></span></td>
+      <td class='a-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id", '', true), $todo->name, '', "class='colorbox'");?></td>
+      <td><?php echo $todo->begin;?></td>
+      <td><?php echo $todo->end;?></td>
+      <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>
+    </tr>
+    <?php endforeach;?>
+    </tbody>
+    <tfoot><tr><td colspan='8'><?php $pager->show();?></td></tr></tfoot>
+  </table>
+</form>
+<script type='text/javascript'>
+$(function(){
+    $('#<?php echo $type?>').find('a').addClass('active');
+})
+</script>
 <?php include '../../common/view/footer.html.php';?>