diff --git a/module/todo/control.php b/module/todo/control.php
index 9546e01b68..bc2af3e8d0 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -196,8 +196,9 @@ class todo extends control
             $storys    = $this->loadModel('story')->getUserStoryPairs($account);
             if(isset($this->config->maxVersion))
             {
-                $issues = $this->loadModel('issue')->getUserIssuePairs($account);
-                $risks  = $this->loadModel('risk')->getUserRiskPairs($account);
+                $issues        = $this->loadModel('issue')->getUserIssuePairs($account);
+                $risks         = $this->loadmodel('risk')->getuserriskpairs($account);
+                $opportunities = $this->loadmodel('opportunity')->getUserOpportunityPairs($account);
             }
             $testtasks = $this->loadModel('testtask')->getUserTestTaskPairs($account);
 
@@ -238,8 +239,9 @@ class todo extends control
             $this->view->storys      = $storys;
             if(isset($this->config->maxVersion))
             {
-                $this->view->issues = $issues;
-                $this->view->risks  = $risks;
+                $this->view->issues        = $issues;
+                $this->view->risks         = $risks;
+                $this->view->opportunities = $opportunities;
             }
             $this->view->reviews     = $reviews;
             $this->view->testtasks   = $testtasks;
@@ -559,8 +561,9 @@ class todo extends control
             $tasks     = $this->loadModel('task')->getUserTaskPairs($account);
             if(isset($this->config->maxVersion))
             {
-                $issues = $this->loadModel('issue')->getUserIssuePairs($account);
-                $risks  = $this->loadModel('risk')->getUserRiskPairs($account);
+                $issues        = $this->loadModel('issue')->getUserIssuePairs($account);
+                $risks         = $this->loadModel('risk')->getUserRiskPairs($account);
+                $opportunities = $this->loadModel('opprotunity')->getUserOpportunityPairs($account);
             }
             $testTasks = $this->loadModel('testtask')->getUserTesttaskPairs($account);
             if(isset($this->config->qcVersion)) $reviews = $this->loadModel('review')->getUserReviewPairs($account, 0, 'wait');
@@ -582,6 +585,7 @@ class todo extends control
                 {
                     if($type == 'issue') $todo->name = isset($issues[$todo->idvalue]) ? $issues[$todo->idvalue] . "(#$todo->idvalue)" : '';
                     if($type == 'risk')  $todo->name = isset($risks[$todo->idvalue])  ? $risks[$todo->idvalue] . "(#$todo->idvalue)" : '';
+                    if($type == 'opportunity')  $todo->name = isset($opportunities[$todo->idvalue])  ? $opportunities[$todo->idvalue] . "(#$todo->idvalue)" : '';
                 }
                 if($type == 'testtask')           $todo->name    = isset($testTasks[$todo->idvalue]) ? $testTasks[$todo->idvalue] . "(#$todo->idvalue)" : '';
                 if($type == 'review' && isset($this->config->qcVersion)) $todo->name = isset($reviews[$todo->idvalue]) ? $reviews[$todo->idvalue] . "(#$todo->idvalue)" : '';
diff --git a/module/todo/view/batchedit.html.php b/module/todo/view/batchedit.html.php
index 1fbb658021..fa1c1d4476 100644
--- a/module/todo/view/batchedit.html.php
+++ b/module/todo/view/batchedit.html.php
@@ -104,6 +104,10 @@
           {
               echo html::select("testtasks[$todo->id]", $testtasks, $todo->idvalue, 'class="form-control chosen"');
           }
+          elseif($todo->type == 'opportunity')
+          {
+              echo html::select("opportunities[$todo->id]", $opportunities, $todo->idvalue, 'class="form-control chosen"');
+          }
           ?>
           </div>
         </td>
@@ -111,9 +115,9 @@
         <td <?php echo zget($visibleFields, 'beginAndEnd', "class='hidden'")?> style='overflow:visible'>
           <div class='input-group'>
             <?php
-            echo html::select("begins[$todo->id]", $times, $todo->begin, "onchange=\"setBeginsAndEnds($todo->id, 'begin');\" class='form-control chosen control-time-begin'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '2400') ? '' : " disabled"));
+            echo html::select("begins[$todo->id]", $times, substr($todo->begin, 0, 2) . substr($todo->begin, 3, 2), "onchange=\"setBeginsAndEnds($todo->id, 'begin');\" class='form-control chosen control-time-begin'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '2400') ? '' : " disabled"));
             echo '<span class="input-group-addon fix-border fix-padding"></span>';
-            echo html::select("ends[$todo->id]", $times, $todo->end, "onchange=\"setBeginsAndEnds($todo->id, 'end');\" class='form-control chosen control-time-end'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '2400') ? '' : " disabled"));
+            echo html::select("ends[$todo->id]", $times, substr($todo->end, 0, 2) . substr($todo->end, 3, 2), "onchange=\"setBeginsAndEnds($todo->id, 'end');\" class='form-control chosen control-time-end'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '2400') ? '' : " disabled"));
             ?>
             <span class="input-group-addon">
               <div class='checkbox-primary dateSwitcher'>