diff --git a/module/project/js/create.js b/module/project/js/create.js
index d85cf06508..4f83bff8b5 100644
--- a/module/project/js/create.js
+++ b/module/project/js/create.js
@@ -82,9 +82,9 @@ function addNewProduct(obj)
  * @access public
  * @return void
  */
-function setAclList(projectID)
+function setAclList(programID)
 {
-    if(projectID != 0)
+    if(programID != 0)
     {
         $('.aclBox').html($('#programAcl').html());
     }
diff --git a/module/project/js/edit.js b/module/project/js/edit.js
index 115059a858..f9d3c0e2bf 100644
--- a/module/project/js/edit.js
+++ b/module/project/js/edit.js
@@ -3,6 +3,7 @@ $(function()
     $('#parent').change(function()
     {
         var programID = $(this).val();
+        setAclList(programID);
 
         /* Determine whether the project can change the project set. */
         link = createLink('project', 'ajaxCheckProduct', 'programID=' + programID + '&projectID=' + projectID);
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 8916e61159..9ae8e18e97 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -200,6 +200,6 @@
   <?php echo nl2br(html::radio('acl', $lang->project->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
 </div>
 <div id='programAcl' class='hidden'>
-  <?php echo nl2br(html::radio('acl', $lang->program->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
+  <?php echo nl2br(html::radio('acl', $lang->program->subAclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 04bf2191c7..905b5b77f1 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -173,7 +173,7 @@
   <?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl == 'project' ? 'private' : 'open', "onclick='setWhite(this.value);'", 'block'));?>
 </div>
 <div id='programAcl' class='hidden'>
-  <?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?>
+  <?php echo nl2br(html::radio('acl', $lang->program->subAclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?>
 </div>
 <div class="modal fade" id="promptBox">
   <div class="modal-dialog mw-600px">
diff --git a/module/upgrade/view/mergeprogram.html.php b/module/upgrade/view/mergeprogram.html.php
index 69482dfe59..dcc3c5b431 100644
--- a/module/upgrade/view/mergeprogram.html.php
+++ b/module/upgrade/view/mergeprogram.html.php
@@ -43,7 +43,7 @@
           <tbody>
           <?php foreach($noMergedSprints as $sprintID => $sprint):?>
           <tr>
-            <td><?php echo "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}" . html::hidden("sprints[]", $sprint->id);?></td>
+            <td><?php echo "{$sprint->name}" . html::hidden("sprints[]", $sprint->id);?></td>
             <td class='divider'><i class='icon icon-angle-double-right'></i></td>
             <td><?php echo html::select("projects[]", $sprint->projects, '', "class='form-control chosen'");?></td>
           </tr>
diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php
index 8a22b15661..a96838e466 100755
--- a/module/user/view/featurebar.html.php
+++ b/module/user/view/featurebar.html.php
@@ -10,7 +10,7 @@
 
     $label  = "<span class='text'>{$lang->user->schedule}</span>";
     $active = $methodName == 'todo' ? ' btn-active-text' : '';
-    common::printLink('user', 'todo', "userID={$user->id}", $label, '', "class='btn btn-link $active'");
+    common::printLink('user', 'todo', "userID={$user->id}&type=all", $label, '', "class='btn btn-link $active'");
 
     $label  = "<span class='text'>{$lang->user->task}</span>";
     $active = $methodName == 'task' ? ' btn-active-text' : '';