diff --git a/module/program/js/prjcreate.js b/module/program/js/prjcreate.js
index f3d5b6440e..5ea6f6010a 100644
--- a/module/program/js/prjcreate.js
+++ b/module/program/js/prjcreate.js
@@ -19,34 +19,64 @@ $(function()
     $('[data-toggle="tooltip"]').tooltip({placement: 'right'});
 });
 
+/**
+ * Set parent program.
+ *
+ * @access public
+ * @return void
+ */
 function setParentProgram()
 {
     var parentProgram = $("#parent").val();
     location.href = createLink('program', 'PRJCreate', 'model=' + model + '&programID=' + parentProgram + '&from=' + from + '&copyProjectID=' + copyProjectID);
 }
 
+/**
+ * Set copy project.
+ *
+ * @param  int $copyProjectID
+ * @access public
+ * @return void
+ */
 function setCopyProject(copyProjectID)
 {
     location.href = createLink('program', 'PRJCreate', 'model=' + model + '&programID=' + programID + '&from=' + from + '&copyProjectID=' + copyProjectID);
 }
 
+/**
+ * Add new product.
+ *
+ * @param  obj $obj
+ * @access public
+ * @return void
+ */
 function addNewProduct(obj)
 {
     if($(obj).attr('checked'))
     {
+        $('#productName').removeAttr('disabled', true);
         $('#productName').closest('tr').removeClass('hidden');
-        $('#plans').closest('tr').addClass('hidden');
-        $(obj).closest('.input-group').find('select').attr('disabled', true).trigger("chosen:updated");
+        $('#plansBox .col-sm-4').find('select').attr('disabled', true).trigger("chosen:updated");
+        $('#plansBox').closest('tr').addClass('hidden');
+        $('#productsBox .col-sm-4 .input-group').find('select').attr('disabled', true).trigger("chosen:updated");
     }
     else
     {
+        $('#productName').attr('disabled', true);
         $('#productName').closest('tr').addClass('hidden');
-        $('#plans').closest('tr').removeClass('hidden');
-        $(obj).closest('.input-group').find('select').removeAttr('disabled').trigger("chosen:updated");
+        $('#plansBox .col-sm-4').find('select').removeAttr('disabled', true).trigger("chosen:updated");
+        $('#plansBox').closest('tr').removeClass('hidden');
+        $('#productsBox .col-sm-4 .input-group').find('select').removeAttr('disabled').trigger("chosen:updated");
     }
 }
 
-
+/**
+ * Set access control box.
+ *
+ * @param  int $programID
+ * @access public
+ * @return void
+ */
 function setAclList(programID)
 {
     if(programID != 0)
@@ -111,6 +141,14 @@ function loadBranches(product)
     loadPlans(product);
 }
 
+/**
+ * Load plans.
+ *
+ * @param  obj $product
+ * @param  int $branchID
+ * @access public
+ * @return void
+ */
 function loadPlans(product, branchID)
 {
     if($('#plansBox').size() == 0) return false;
@@ -136,6 +174,12 @@ function loadPlans(product, branchID)
     }
 }
 
+/**
+ * Adjust product box margin.
+ *
+ * @access public
+ * @return void
+ */
 function adjustProductBoxMargin()
 {
     var productRows = Math.ceil($('#productsBox > .row > .col-sm-4').length / 3);
@@ -148,6 +192,12 @@ function adjustProductBoxMargin()
     }
 }
 
+/**
+ * Adjust plan box margin.
+ *
+ * @access public
+ * @return void
+ */
 function adjustPlanBoxMargin()
 {
     var planRows = Math.ceil($('#plansBox > .row > .col-sm-4').length / 3);
diff --git a/module/program/view/prjcreate.html.php b/module/program/view/prjcreate.html.php
index c0491996cb..5c5249b9c5 100644
--- a/module/program/view/prjcreate.html.php
+++ b/module/program/view/prjcreate.html.php
@@ -63,7 +63,7 @@
               </div>
               <?php $i++;?>
               <?php endforeach;?>
-                <div class='col-sm-4 <?php if($programID) echo 'required';?>'>
+              <div class='col-sm-4 <?php if($programID) echo 'required';?>'>
                 <div class='input-group'>
                   <?php echo html::select("products[$i]", $allProducts, '', "class='form-control chosen' onchange='loadBranches(this)'");?>
                   <span class='input-group-addon'><?php echo html::checkBox('newProduct', $lang->program->addProduct, '', "onchange=addNewProduct(this);");?></span>