diff --git a/module/product/config/formdata.php b/module/product/config/formdata.php
index 5053beae64..5a8a97e9b3 100644
--- a/module/product/config/formdata.php
+++ b/module/product/config/formdata.php
@@ -41,7 +41,6 @@ $config->product->form->edit['whitelist'] = array('type' => 'array',   'control'
 $config->product->form->batchEdit = array();
 $config->product->form->batchEdit['program'] = array('type' => 'int',    'control' => 'select',    'width' => '200px', 'required' => false, 'default' => 0, 'options' => array());
 $config->product->form->batchEdit['name']    = array('type' => 'string', 'control' => 'text',      'width' => '240px', 'required' => true,  'base'    => true);
-$config->product->form->batchEdit['line']    = array('type' => 'int',    'control' => 'select',    'width' => '200px', 'required' => false, 'default' => 0,         'options' => array());
 $config->product->form->batchEdit['PO']      = array('type' => 'string', 'control' => 'select',    'width' => '128px', 'required' => false, 'default' => '',        'options' => array());
 $config->product->form->batchEdit['QD']      = array('type' => 'string', 'control' => 'select',    'width' => '128px', 'required' => false, 'default' => '',        'options' => array());
 $config->product->form->batchEdit['RD']      = array('type' => 'string', 'control' => 'select',    'width' => '128px', 'required' => false, 'default' => '',        'options' => array());
@@ -77,5 +76,5 @@ if($config->systemMode != 'ALM' && $config->systemMode != 'PLM')
 {
     unset($config->product->form->create['program'], $config->product->form->create['line']);
     unset($config->product->form->edit['program'], $config->product->form->edit['line']);
-    unset($config->product->form->batchEdit['program'], $config->product->form->batchEdit['line']);
+    unset($config->product->form->batchEdit['program']);
 }
diff --git a/module/program/ui/productview.html.php b/module/program/ui/productview.html.php
index d86697ffbb..c129127e63 100644
--- a/module/program/ui/productview.html.php
+++ b/module/program/ui/productview.html.php
@@ -90,7 +90,7 @@ $fnGenerateProgramRowData = function($programID, $program) use ($config, $users)
 /* Closure for generating product line row data. */
 $fnGenerateLineRowData = function($programID, $lineID, $line) use ($config, &$linesCount)
 {
-    if(!isset($line['lineName']) || !isset($line['products']) || !is_array($line['products']) || $config->systemMode != 'ALM' || $config->systemMode != 'PLM') return null;
+    if(!isset($line['lineName']) || !isset($line['products']) || !is_array($line['products']) || ($config->systemMode != 'ALM' && $config->systemMode != 'PLM')) return null;
 
     /* ALM mode with Product Line. */
     $linesCount++;
@@ -160,7 +160,7 @@ foreach($productStructure as $programID => $program)
             if(!isset($program[$lineID]))
             {
                 $program[$lineID] = array();
-                $program[$lineID]['product']  = '';
+                $program[$lineID]['products'] = array();
                 $program[$lineID]['lineName'] = $lineName;
             }
         }
diff --git a/module/project/ui/create.html.php b/module/project/ui/create.html.php
index 974aed652f..78430fc170 100644
--- a/module/project/ui/create.html.php
+++ b/module/project/ui/create.html.php
@@ -284,10 +284,10 @@ formPanel
             set::label($lang->project->budget),
             inputGroup
             (
-                set::prefix(zget($lang->project->currencySymbol, $currency)),
-                set::prefixWidth('icon'),
+                $parentProgram ? span(setClass('input-group-addon'), zget($lang->project->currencySymbol, $currency)) : null,
                 input(set::name('budget')),
-                $parentProgram ? formHidden('budgetUnit', $parentProgram->budgetUnit) : picker(
+                $parentProgram ? formHidden('budgetUnit', $parentProgram->budgetUnit) : picker
+                (
                     set::name('budgetUnit'),
                     set::items($budgetUnitList),
                     set::value($config->project->defaultCurrency),