diff --git a/module/program/ui/common.field.php b/module/program/ui/common.field.php
index 089b3f5978..7eb3b0d55f 100644
--- a/module/program/ui/common.field.php
+++ b/module/program/ui/common.field.php
@@ -19,9 +19,7 @@ $fields->field('begin');
 
 $fields->field('budget')
     ->control('inputGroup')
-    ->checkbox(array('name' => 'future', 'text' => $lang->project->future))
-    ->itemBegin('budget')->control('input')->prefix(data('parentProgram') ? data('parentProgram.budgetUnit') : '')->prefixWidth(20)->itemEnd()
-    ->item(data('parentProgram') ? field('budgetUnit')->hidden(true)->value(data('parentProgram.budgetUnit')) : field('budgetUnit')->required()->control('picker')->name('budgetUnit')->items(data('budgetUnitList'))->value($config->project->defaultCurrency));
+    ->checkbox(array('name' => 'future', 'text' => $lang->project->future));
 
 $fields->field('desc')
     ->width('full')
@@ -29,11 +27,9 @@ $fields->field('desc')
 
 $fields->field('acl')
     ->width('full')
-    ->control('radioList')
-    ->items(data('parentProgram') ? $lang->program->subAclList : $lang->program->aclList);
+    ->control('radioList');
 
 $fields->field('whitelist')
-    ->hidden(true)
     ->width('full')
     ->control('whitelist')
     ->items(data('users'));
diff --git a/module/program/ui/create.field.php b/module/program/ui/create.field.php
index 38dc032e2b..9f5911c9fa 100644
--- a/module/program/ui/create.field.php
+++ b/module/program/ui/create.field.php
@@ -12,4 +12,13 @@ $fields->field('begin')
     ->itemBegin()->type('addon')->label($lang->project->to)->text($lang->colon)->itemEnd()
     ->itemBegin('end')->require()->type('datePicker')->placeholder($lang->project->end)->itemEnd();
 
-$fields->field('acl')->value('open');
+$fields->field('budget')
+    ->itemBegin('budget')->control('input')->prefix(data('parentProgram') ? data('parentProgram.budgetUnit') : '')->prefixWidth(20)->itemEnd()
+    ->item(data('parentProgram') ? field('budgetUnit')->hidden(true)->value(data('parentProgram.budgetUnit')) : field('budgetUnit')->required()->control('picker')->name('budgetUnit')->items(data('budgetUnitList'))->value($config->project->defaultCurrency));
+
+$fields->field('acl')
+    ->items(data('parentProgram') ? $lang->program->subAclList : $lang->program->aclList)
+    ->value('open');
+
+$fields->field('whitelist')
+    ->hidden(true);
diff --git a/module/program/ui/edit.field.php b/module/program/ui/edit.field.php
index 134dbeb82b..6b74dcef84 100644
--- a/module/program/ui/edit.field.php
+++ b/module/program/ui/edit.field.php
@@ -11,3 +11,16 @@ $fields->field('begin')
     ->itemBegin('begin')->require()->type('datePicker')->value(data('program.begin'))->placeholder($lang->project->begin)->itemEnd()
     ->itemBegin()->type('addon')->label($lang->project->to)->text($lang->colon)->itemEnd()
     ->itemBegin('end')->require()->type('datePicker')->value(data('program.end'))->placeholder($lang->project->end)->itemEnd();
+
+$fields->field('budget')
+    ->checkbox(array('name' => 'future', 'text' => $lang->project->future, 'checked' => data('program.budget') == 0 ? true : false))
+    ->itemBegin('budget')->control('input')->value(data('program.budget'))->prefix(data('parentProgram') ? data('parentProgram.budgetUnit') : '')->prefixWidth(20)->itemEnd()
+    ->item(data('program.parent') ? field('budgetUnit')->hidden(true)->value(data('parentProgram.budgetUnit')) : field('budgetUnit')->required()->control('picker')->name('budgetUnit')->items(data('budgetUnitList'))->value($config->project->defaultCurrency));
+    //->item('syncPRJUnit')->hidden()->value('false')
+    //->item('exchangeRate')->hidden()->value('');
+
+$fields->field('acl')
+    ->items(data('program.parent') ? $lang->program->subAclList : $lang->program->aclList);
+
+$fields->field('whitelist')
+    ->hidden(data('program.acl') == 'open');