diff --git a/module/project/js/common.js b/module/project/js/common.js
index cd2ea7ffe4..222cb22d50 100644
--- a/module/project/js/common.js
+++ b/module/project/js/common.js
@@ -156,7 +156,7 @@ function loadBranches(product)
         if(data)
         {
             $inputgroup.append(data);
-            $inputgroup.find('select:last').attr('name', 'branch[' + index + ']').attr('id', 'branch' + index).css('width', '80px');
+            $inputgroup.find('select:last').attr('name', 'branch[' + index + ']').attr('id', 'branch' + index).chosen();
         }
     });
 
@@ -198,7 +198,7 @@ function adjustPlanBoxMargin()
     var planRows = Math.ceil($('#plansBox > .row > .col-sm-4').length / 3);
     if(planRows > 1)
     {
-        for(j = 1; j <= productRows - 1; j++)
+        for(j = 1; j <= planRows - 1; j++)
         {
             $('#plansBox .col-sm-4:lt(' + (j * 3) + ')').css('margin-bottom', '10px');
         }
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 220cdaa3ca..c3a50aba12 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -14,150 +14,152 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
-<div class='container mw-1400px'>
-  <div id='titlebar'>
-    <div class='heading'>
-      <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
-      <strong><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?></strong>
-      <small class='text-muted'> <?php echo $lang->project->edit;?> <?php echo html::icon($lang->icons['edit']);?></small>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <span class='prefix'><?php echo html::icon($lang->icons['project']);?> <strong><?php echo $project->id;?></strong></span>
+        <strong><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?></strong>
+        <small><?php echo $lang->arrow . ' ' . $lang->project->edit;?></small>
+      </h2>
     </div>
-  </div>
-  <form class='form-condensed' method='post' target='hiddenwin' id='dataform'>
-    <table class='table table-form'>
-      <tr>
-        <th class='w-90px'><?php echo $lang->project->name;?></th>
-        <td class='w-p45'><?php echo html::input('name', $project->name, "class='form-control' autocomplete='off'");?></td><td></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->project->code;?></th>
-        <td><?php echo html::input('code', $project->code, "class='form-control' autocomplete='off'");?></td>
-      </tr>
-      <tr>
-        <th class='w-90px'><?php echo $lang->project->dateRange;?></th>
-        <td>
-          <div class='input-group'>
-            <?php echo html::input('begin', $project->begin, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "'");?>
-            <span class='input-group-addon fix-border'><?php echo $lang->project->to;?></span>
-            <?php echo html::input('end', $project->end, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "'");?>
-            <div class='input-group-btn'>
-              <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><?php echo $lang->project->byPeriod;?> <span class='caret'></span></button>
-              <ul class='dropdown-menu'>
-              <?php foreach ($lang->project->endList as $key => $name):?>
-                <li><a href='javascript:computeEndDate("<?php echo $key;?>")'><?php echo $name;?></a></li>
+    <form class='load-indicator main-form' method='post' target='hiddenwin' id='dataform'>
+      <table class='table table-form'>
+        <tr>
+          <th><?php echo $lang->project->name;?></th>
+          <td><?php echo html::input('name', $project->name, "class='form-control' autocomplete='off' required");?></td><td></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->project->code;?></th>
+          <td><?php echo html::input('code', $project->code, "class='form-control' autocomplete='off' required");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->project->dateRange;?></th>
+          <td>
+            <div class='input-group'>
+              <?php echo html::input('begin', $project->begin, "class='form-control form-date' onchange='computeWorkDays()' required placeholder='" . $lang->project->begin . "'");?>
+              <span class='input-group-addon fix-border'><?php echo $lang->project->to;?></span>
+              <?php echo html::input('end', $project->end, "class='form-control form-date' onchange='computeWorkDays()' required placeholder='" . $lang->project->end . "'");?>
+              <div class='input-group-btn'>
+                <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><?php echo $lang->project->byPeriod;?> <span class='caret'></span></button>
+                <ul class='dropdown-menu'>
+                  <?php foreach ($lang->project->endList as $key => $name):?>
+                  <li><a href='javascript:computeEndDate("<?php echo $key;?>")'><?php echo $name;?></a></li>
+                  <?php endforeach;?>
+                </ul>
+              </div>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->project->days;?></th>
+          <td>
+            <div class='input-group'>
+              <?php echo html::input('days', $project->days, "class='form-control' autocomplete='off'");?>
+              <span class='input-group-addon'><?php echo $lang->project->day;?></span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->project->type;?></th>
+          <td><?php echo html::select('type', $lang->project->typeList, $project->type, "class='form-control'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->project->teamname;?></th>
+          <td><?php echo html::input('team', $project->team, "class='form-control' autocomplete='off'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->project->status;?></th>
+          <td><?php echo html::select('status', $lang->project->statusList, $project->status, "class='form-control'");?></td>
+        </tr>
+        <?php if($this->config->global->flow == 'onlyTask'):?>
+        <tr>
+          <th><?php echo $lang->project->owner;?></th>
+          <td><?php echo html::select('PM', $pmUsers, $project->PM, "class='form-control chosen'");?></td>
+        </tr>
+        <?php else:?>
+        <tr>
+          <th rowspan='2'><?php echo $lang->project->owner;?></th>
+          <td>
+            <div class='input-group'>
+              <span class='input-group-addon'><?php echo $lang->project->PO;?></span>
+              <?php echo html::select('PO', $poUsers, $project->PO, "class='form-control chosen'");?>
+            </div>
+          </td>
+          <td>
+            <div class='input-group'>
+              <span class='input-group-addon'><?php echo $lang->project->QD;?></span>
+              <?php echo html::select('QD', $qdUsers, $project->QD, "class='form-control chosen'");?>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <div class='input-group'>
+              <span class='input-group-addon'><?php echo $lang->project->PM;?></span>
+              <?php echo html::select('PM', $pmUsers, $project->PM, "class='form-control chosen'");?>
+            </div>
+          </td>
+          <td>
+            <div class='input-group'>
+              <span class='input-group-addon'><?php echo $lang->project->RD;?></span>
+              <?php echo html::select('RD', $rdUsers, $project->RD, "class='form-control chosen'");?>
+            </div>
+          </td>
+        </tr>
+        <?php endif;?>
+        <tr <?php if($this->config->global->flow == 'onlyTask') echo "class='hidden'";?>>
+          <th><?php echo $lang->project->manageProducts;?></th>
+          <td class='text-left' id='productsBox' colspan="2">
+            <div class='row'>
+              <?php $i = 0;?>
+              <?php foreach($linkedProducts as $product):?>
+              <div class='col-sm-4'>
+                <div class='input-group'>
+                  <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "'");?>
+                  <span class='input-group-addon fix-border'></span>
+                  <?php if($product->type != 'normal' and isset($branchGroups[$product->id])) echo html::select("branch[$i]", $branchGroups[$product->id], $product->branch, "class='form-control chosen'")?>
+                </div>
+              </div>
+              <?php $i++;?>
               <?php endforeach;?>
-              </ul>
-            </div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->project->days;?></th>
-        <td>
-          <div class='input-group'>
-          <?php echo html::input('days', $project->days, "class='form-control' autocomplete='off'");?>
-            <span class='input-group-addon'><?php echo $lang->project->day;?></span>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->project->type;?></th>
-        <td><?php echo html::select('type', $lang->project->typeList, $project->type, "class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->project->teamname;?></th>
-        <td><?php echo html::input('team', $project->team, "class='form-control' autocomplete='off'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->project->status;?></th>
-        <td><?php echo html::select('status', $lang->project->statusList, $project->status, "class='form-control'");?></td>
-      </tr>
-      <?php if($this->config->global->flow == 'onlyTask'):?>
-      <tr>
-        <th><?php echo $lang->project->owner;?></th>
-        <td><?php echo html::select('PM', $pmUsers, $project->PM, "class='form-control chosen'");?></td>
-      </tr>
-      <?php else:?>
-      <tr>
-        <th rowspan='2'><?php echo $lang->project->owner;?></th>
-        <td>
-          <div class='input-group'>
-            <span class='input-group-addon'><?php echo $lang->project->PO;?></span>
-            <?php echo html::select('PO', $poUsers, $project->PO, "class='form-control chosen'");?>
-          </div>
-        </td>
-        <td>
-          <div class='input-group'>
-            <span class='input-group-addon'><?php echo $lang->project->QD;?></span>
-            <?php echo html::select('QD', $qdUsers, $project->QD, "class='form-control chosen'");?>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td style='padding-left: 5px;'>
-          <div class='input-group'>
-            <span class='input-group-addon'><?php echo $lang->project->PM;?></span>
-            <?php echo html::select('PM', $pmUsers, $project->PM, "class='form-control chosen'");?>
-          </div>
-        </td>
-        <td>
-          <div class='input-group'>
-            <span class='input-group-addon'><?php echo $lang->project->RD;?></span>
-            <?php echo html::select('RD', $rdUsers, $project->RD, "class='form-control chosen'");?>
-          </div>
-        </td>
-      </tr>
-      <?php endif;?>
-      <tr <?php if($this->config->global->flow == 'onlyTask') echo "class='hidden'";?>>
-        <th><?php echo $lang->project->manageProducts;?></th>
-        <td class='text-left' id='productsBox' colspan="2">
-          <div class='row'>
-            <?php $i = 0;?>
-            <?php foreach($linkedProducts as $product):?>
-            <div class='col-sm-3'>
-              <div class='input-group'>
-                <?php echo html::select("products[$i]", $allProducts, $product->id, "class='form-control chosen' onchange='loadBranches(this)' data-last='" . $product->id . "'");?>
-                <span class='input-group-addon fix-border' style='padding:0px'></span>
-                <?php if($product->type != 'normal' and isset($branchGroups[$product->id])) echo html::select("branch[$i]", $branchGroups[$product->id], $product->branch, "class='form-control' style='width:80px'")?>
+              <div class='col-sm-4'>
+                <div class='input-group'>
+                  <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
+                  <span class='input-group-addon fix-border'></span>
+                </div>
               </div>
             </div>
-            <?php $i++;?>
-            <?php endforeach;?>
-            <div class='col-sm-3'>
-              <div class='input-group'>
-                <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
-                <span class='input-group-addon fix-border' style='padding:0px'></span>
-              </div>
-            </div>
-          </div>
-        </td>
-      </tr>
-      <tr <?php if($this->config->global->flow == 'onlyTask') echo "class='hidden'";?>>
-        <th><?php echo $lang->project->linkPlan;?></th>
-        <td class='text-left' id="plansBox" colspan="2">
-          <div class='row'>
-          <?php foreach($plans as $productID => $plan):?>
-            <div class="col-sm-3" id="plan<?php echo $productID;?>">
+          </td>
+        </tr>
+        <tr <?php if($this->config->global->flow == 'onlyTask') echo "class='hidden'";?>>
+          <th><?php echo $lang->project->linkPlan;?></th>
+          <td class='text-left' id="plansBox" colspan="2">
+            <div class='row'>
+            <?php foreach($plans as $productID => $plan):?>
+              <div class="col-sm-4" id="plan<?php echo $productID;?>">
                 <?php echo html::select("plans[$productID]", $plan, $linkedProducts[$productID]->plan, "class='form-control'");?>
+              </div>
+            <?php endforeach;?>
             </div>
-          <?php endforeach;?>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->project->desc;?></th>
-        <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($project->desc), "rows='6' class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->project->acl;?></th>
-        <td colspan='2'><?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?></td>
-      </tr>
-      <tr id='whitelistBox' <?php if($project->acl != 'custom') echo "class='hidden'";?>>
-        <th><?php echo $lang->project->whitelist;?></th>
-        <td colspan='2' id='whitelistBox'><?php echo html::checkbox('whitelist', $groups, $project->whitelist);?></td>
-      </tr>
-      <tr><td></td><td colspan='2'><?php echo html::submitButton() . html::backButton();?></td></tr>
-    </table>
-  </form>
+          </td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->project->desc;?></th>
+          <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($project->desc), "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
+        </tr>
+        <tr>
+          <th><?php echo $lang->project->acl;?></th>
+          <td colspan='2'><?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?></td>
+        </tr>
+        <tr id='whitelistBox' <?php if($project->acl != 'custom') echo "class='hidden'";?>>
+          <th><?php echo $lang->project->whitelist;?></th>
+          <td colspan='2' id='whitelistBox'><?php echo html::checkbox('whitelist', $groups, $project->whitelist, '', '', 'inline');?></td>
+        </tr>
+        <tr><td colspan='3' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::backButton('', '', 'btn btn-wide btn-gray');?></td></tr>
+      </table>
+    </form>
+  </div>
 </div>
 <?php js::set('weekend', $config->project->weekend);?>
 <?php js::set('errorSameProducts', $lang->project->errorSameProducts);?>