diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php
index 95b0267ffc..653a9fda48 100644
--- a/module/todo/view/edit.html.php
+++ b/module/todo/view/edit.html.php
@@ -13,73 +13,75 @@
 <?php include '../../common/view/header.html.php';?>
  <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix'><?php echo html::icon($lang->icons['todo']) . ' #' . $todo->id;;?></span>
-    <strong><?php echo html::a($this->createLink('todo', 'view', 'todo=' . $todo->id), $todo->name);?></strong>
-    <small class='text-success'> <?php echo $lang->todo->edit;?> <?php echo html::icon($lang->icons['edit']);?></small>
+<div class='container mw-700px'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon($lang->icons['todo']) . ' #' . $todo->id;;?></span>
+      <strong><?php echo html::a($this->createLink('todo', 'view', 'todo=' . $todo->id), $todo->name);?></strong>
+      <small class='text-success'> <?php echo $lang->todo->edit;?> <?php echo html::icon($lang->icons['edit']);?></small>
+    </div>
   </div>
-</div>
 
-<form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-  <table class='table table-form'> 
-    <tr>
-      <th class='w-80px'><?php echo $lang->todo->date;?></th>
-      <td class='w-p45'>
-        <div class='input-group'>
-          <?php echo html::input('date', $todo->date, "class='form-control form-date'");?>
-          <span class='input-group-addon'><input type='checkbox' id='switchDate' onclick='switchDateTodo(this);'> <?php echo $lang->todo->periods['future'];?></span>
-        </div>
-      </td><td></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->todo->type;?></th>
-      <td><input type='hidden' name='type' value='<?php echo $todo->type;?>' /><?php echo $lang->todo->typeList[$todo->type];?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->todo->pri;?></th>
-      <td><?php echo html::select('pri', $lang->todo->priList, $todo->pri, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->todo->name;?></th>
-      <td colspan='2'><div id='nameBox'>
-        <?php
-        $readType = $todo->type != 'custom' ? 'readonly' : '';
-        echo html::input('name', $todo->name, "$readType class=form-control");
-        ?>
-        </div>
-      </td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->todo->desc;?></th>
-      <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($todo->desc), "rows=8 class=area-1");?></td>
-    </tr>
-    <tr>
-      <th><?php echo $lang->todo->status;?></th>
-      <td><?php echo html::select('status', $lang->todo->statusList, $todo->status, "class='form-control'");?></td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->todo->beginAndEnd;?></th>
-      <td>
-        <div class='input-group'>
-          <?php echo html::select('begin', $times, $todo->begin, 'onchange=selectNext(); class="form-control" style="width: 50%"') . html::select('end', $times, $todo->end, 'class="form-control" style="width: 50%"');?>
-        </div>
-      </td>
-      <td>
-        <input type='checkbox' id='dateSwitcher' onclick='switchDateFeature(this);' <?php if($todo->begin == 2400) echo 'checked';?> > <?php echo $lang->todo->lblDisableDate;?>
-      </td>
-    </tr>  
-    <tr>
-      <th><?php echo $lang->todo->private;?></th>
-      <td><input type='checkbox' name='private' id='private' value='1' <?php if($todo->private) echo 'checked';?>></td>
-    </tr>  
-    <tr>
-      <td></td>
-      <td>
-        <?php echo html::submitButton() . html::backButton();?>
-      </td>
-    </tr>
-  </table>
-</form>
+  <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
+    <table class='table table-form'> 
+      <tr>
+        <th class='w-80px'><?php echo $lang->todo->date;?></th>
+        <td class='w-p45'>
+          <div class='input-group'>
+            <?php echo html::input('date', $todo->date, "class='form-control form-date'");?>
+            <span class='input-group-addon'><input type='checkbox' id='switchDate' onclick='switchDateTodo(this);'> <?php echo $lang->todo->periods['future'];?></span>
+          </div>
+        </td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->todo->type;?></th>
+        <td><input type='hidden' name='type' value='<?php echo $todo->type;?>' /><?php echo $lang->todo->typeList[$todo->type];?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->todo->pri;?></th>
+        <td><?php echo html::select('pri', $lang->todo->priList, $todo->pri, "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->todo->name;?></th>
+        <td colspan='2'><div id='nameBox'>
+          <?php
+          $readType = $todo->type != 'custom' ? 'readonly' : '';
+          echo html::input('name', $todo->name, "$readType class=form-control");
+          ?>
+          </div>
+        </td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->todo->desc;?></th>
+        <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($todo->desc), "rows=8 class=area-1");?></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->todo->status;?></th>
+        <td><?php echo html::select('status', $lang->todo->statusList, $todo->status, "class='form-control'");?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->todo->beginAndEnd;?></th>
+        <td>
+          <div class='input-group'>
+            <?php echo html::select('begin', $times, $todo->begin, 'onchange=selectNext(); class="form-control" style="width: 50%"') . html::select('end', $times, $todo->end, 'class="form-control" style="width: 50%"');?>
+          </div>
+        </td>
+        <td>
+          <input type='checkbox' id='dateSwitcher' onclick='switchDateFeature(this);' <?php if($todo->begin == 2400) echo 'checked';?> > <?php echo $lang->todo->lblDisableDate;?>
+        </td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->todo->private;?></th>
+        <td><input type='checkbox' name='private' id='private' value='1' <?php if($todo->private) echo 'checked';?>></td>
+      </tr>  
+      <tr>
+        <td></td>
+        <td>
+          <?php echo html::submitButton() . html::backButton();?>
+        </td>
+      </tr>
+    </table>
+  </form>
+</div>
 <?php include './footer.html.php';?>
 <script language='Javascript'>switchDateFeature(document.getElementById('dateSwitcher'));</script>
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index 4339015f8a..9480351166 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -12,77 +12,79 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php if(!$todo->private or ($todo->private and $todo->account == $app->user->account)):?>
-<div id='titlebar'>
-  <div class='heading'>
-    <span class='prefix' title='TODO'><?php echo html::icon($lang->icons['todo']) . ' #' . $todo->id;?></span>
-    <strong><?php echo $todo->name;?></strong>
+<div class='container mw-700px'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix' title='TODO'><?php echo html::icon($lang->icons['todo']) . ' #' . $todo->id;?></span>
+      <strong><?php echo $todo->name;?></strong>
+    </div>
   </div>
-</div>
-<div class='main'>
-  <div class='panel mg-0'>
-    <div class='panel-heading'>
-      <strong><?php 
-      if($todo->type == 'bug')    echo html::a($this->createLink('bug',  'view', "id={$todo->idvalue}"), $todo->name);
-      if($todo->type == 'task')   echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), $todo->name);
-      if($todo->type == 'custom') echo $todo->name;
-      ?></strong>
-      <div class='panel-actions pull-right' title='<?php echo $lang->todo->beginAndEnd;?>' style='line-height: 35px'>
-        <?php echo $lang->todo->beginAndEnd;?>:
+  <div class='main' style='margin-top: 10px'>
+    <div class='panel mg-0'>
+      <div class='panel-heading'>
+        <strong><?php 
+        if($todo->type == 'bug')    echo html::a($this->createLink('bug',  'view', "id={$todo->idvalue}"), $todo->name);
+        if($todo->type == 'task')   echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), $todo->name);
+        if($todo->type == 'custom') echo $todo->name;
+        ?></strong>
+        <div class='panel-actions pull-right' title='<?php echo $lang->todo->beginAndEnd;?>' style='line-height: 35px'>
+          <?php echo $lang->todo->beginAndEnd;?>:
+          <?php
+          if(isset($times[$todo->begin])) echo $times[$todo->begin];
+          if(isset($times[$todo->end]))   echo ' ~ ' . $times[$todo->end];
+          ?>
+        </div>
+        <div title='<?php echo $lang->todo->status;?>' class='panel-actions todo-<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></div>
+      </div>
+      <div class='panel-body'>
+        <div class='article-content'><?php echo $todo->desc;?></div>
+        <hr style='margin: 10px 0'>
+        <table class='table table-data table-borderless'> 
+          <tr>
+            <th class='w-80px'><?php echo $lang->todo->account;?></th>
+            <td><?php echo $todo->account;?></td>
+            <th class='w-80px'><?php echo $lang->todo->date;?></th>
+            <td><?php echo $todo->date == '20300101' ? $lang->todo->periods['future'] : date(DT_DATE1, strtotime($todo->date));?></td>
+          </tr>
+          <tr>
+            <th><?php echo $lang->todo->type;?></th>
+            <td><?php echo $lang->todo->typeList[$todo->type];?></td>
+            <th><?php echo $lang->todo->pri;?></th>
+            <td><?php echo $lang->todo->priList[$todo->pri];?></td>
+          </tr>
+        </table>
+      </div>
+      <div class='panel-footer text-center'>
         <?php
-        if(isset($times[$todo->begin])) echo $times[$todo->begin];
-        if(isset($times[$todo->end]))   echo ' ~ ' . $times[$todo->end];
+        if($this->session->todoList)
+        {
+            $browseLink = $this->session->todoList;
+        }
+        elseif($todo->account == $app->user->account)
+        {
+            $browseLink = $this->createLink('my', 'todo');
+        }
+        else
+        {
+            $browseLink = $this->createLink('user', 'todo', "account=$todo->account");
+        }
+
+        common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'button', '', 'hiddenwin', 'showinonlybody btn-success');
+        if($todo->account == $app->user->account)
+        {
+            common::printIcon('todo', 'edit',   "todoID=$todo->id");
+            common::printIcon('todo', 'delete', "todoID=$todo->id", '', 'button', '', 'hiddenwin');
+        }
+        common::printRPN($browseLink);
         ?>
       </div>
-      <div title='<?php echo $lang->todo->status;?>' class='panel-actions todo-<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></div>
-    </div>
-    <div class='panel-body'>
-      <div class='article-content'><?php echo $todo->desc;?></div>
-      <hr style='margin: 10px 0'>
-      <table class='table table-data table-borderless'> 
-        <tr>
-          <th class='w-80px'><?php echo $lang->todo->account;?></th>
-          <td><?php echo $todo->account;?></td>
-          <th class='w-80px'><?php echo $lang->todo->date;?></th>
-          <td><?php echo $todo->date == '20300101' ? $lang->todo->periods['future'] : date(DT_DATE1, strtotime($todo->date));?></td>
-        </tr>
-        <tr>
-          <th><?php echo $lang->todo->type;?></th>
-          <td><?php echo $lang->todo->typeList[$todo->type];?></td>
-          <th><?php echo $lang->todo->pri;?></th>
-          <td><?php echo $lang->todo->priList[$todo->pri];?></td>
-        </tr>
-      </table>
-    </div>
-    <div class='panel-footer text-center'>
-      <?php
-      if($this->session->todoList)
-      {
-          $browseLink = $this->session->todoList;
-      }
-      elseif($todo->account == $app->user->account)
-      {
-          $browseLink = $this->createLink('my', 'todo');
-      }
-      else
-      {
-          $browseLink = $this->createLink('user', 'todo', "account=$todo->account");
-      }
-
-      common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'button', '', 'hiddenwin', 'showinonlybody btn-success');
-      if($todo->account == $app->user->account)
-      {
-          common::printIcon('todo', 'edit',   "todoID=$todo->id");
-          common::printIcon('todo', 'delete', "todoID=$todo->id", '', 'button', '', 'hiddenwin');
-      }
-      common::printRPN($browseLink);
-      ?>
     </div>
   </div>
-</div>
-<div class='main'>
-  <?php $actionTheme = 'table'; include '../../common/view/action.html.php';?>
-  <?php else:?>
-  <?php echo $lang->todo->thisIsPrivate;?>
-  <?php endif;?>
+  <div class='main'>
+    <?php $actionTheme = 'table'; include '../../common/view/action.html.php';?>
+    <?php else:?>
+    <?php echo $lang->todo->thisIsPrivate;?>
+    <?php endif;?>
+  </div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index cbb56336cd..d45201cd8a 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -479,7 +479,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;}
 .body-modal .outer > form, .body-modal .outer > .container > form {margin: 10px 15px 20px}
 .body-modal .outer > .main, .body-modal .outer > .container > .main, .body-modal > .main {padding: 10px 20px; margin: 0}
 .body-modal > form {padding-bottom: 15px;}
-.body-modal .outer > .container {padding: 0}
+.body-modal .outer > .container {padding: 0; margin: 0; max-width: inherit; border: 0}
 .body-modal #titlebar .actions {right: 40px}
 
 .modal-dialog.fullscreen {width: 100% !important; height: 100% !important; margin: 0; border: none !important;}