diff --git a/module/build/control.php b/module/build/control.php
index cea5526559..8d4f0ff13c 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -72,7 +72,7 @@ class build extends control
         if($this->app->tab == 'project')
         {
             $this->project->setMenu($projectID);
-            $executions    = $this->execution->getPairs($projectID, 'all', 'stagefilter|leaf');
+            $executions    = $this->execution->getPairs($projectID, 'all', 'stagefilter|leaf|order_asc');
             $executionID   = empty($executionID) ? key($executions) : $executionID;
             $productGroups = $executionID ? $this->product->getProducts($executionID) : array();
             $branchGroups  = $executionID ? $this->project->getBranchesByProject($executionID) : array();
@@ -81,7 +81,7 @@ class build extends control
         elseif($this->app->tab == 'execution')
         {
             $execution     = $this->execution->getByID($executionID);
-            $executions    = $this->execution->getPairs($execution->project, 'all', 'stagefilter|leaf');
+            $executions    = $this->execution->getPairs($execution->project, 'all', 'stagefilter|leaf|order_asc');
             $projectID     = $execution->project;
             $productGroups = $this->product->getProducts($executionID);
             $branchGroups  = $this->project->getBranchesByProject($executionID);
diff --git a/module/common/model.php b/module/common/model.php
index 4cdc0b0394..525c199689 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1792,6 +1792,7 @@ EOD;
         $userCondition  = !$app->user->admin ? " AND `id` " . helper::dbIN($app->user->view->sprints) : '';
         $orderBy        = $object->type == 'stage' ? 'ORDER BY `id` ASC' : 'ORDER BY `id` DESC';
         $executionList  = $app->dbh->query("SELECT id,name,parent FROM " . TABLE_EXECUTION . " WHERE `project` = '{$object->project}' AND `deleted` = '0' $userCondition $orderBy")->fetchAll();
+        $executionList  = $app->control->loadModel('execution')->resetExecutionSorts($executionList);
         foreach($executionList as $execution)
         {
             if(isset($executionPairs[$execution->parent])) unset($executionPairs[$execution->parent]);
diff --git a/module/execution/control.php b/module/execution/control.php
index 38651c5404..899e0607d5 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3771,7 +3771,7 @@ class execution extends control
             ->andWhere('type')->in('sprint,stage,kanban')
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
             ->andWhere('project')->in(array_keys($projects))
-            ->orderBy('id_desc')
+            ->orderBy('order_asc')
             ->fetchGroup('project', 'id');
 
         $teams = $this->dao->select('root,account')->from(TABLE_TEAM)
@@ -3788,6 +3788,7 @@ class execution extends control
             $parents = array();
             foreach($executions as $execution) $parents[$execution->parent] = $execution->parent;
 
+            $executions = $this->execution->resetExecutionSorts($executions);
             foreach($executions as $execution)
             {
                 /* Only show leaf executions. */
diff --git a/module/execution/model.php b/module/execution/model.php
index 4abfb60087..b3f627198b 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1366,7 +1366,7 @@ class executionModel extends model
      *
      * @param  int    $projectID
      * @param  string $type all|sprint|stage|kanban
-     * @param  string $mode all|noclosed|stagefilter|withdelete|multiple|leaf or empty
+     * @param  string $mode all|noclosed|stagefilter|withdelete|multiple|leaf|order_asc or empty
      * @access public
      * @return array
      */
@@ -1401,20 +1401,19 @@ class executionModel extends model
             ->beginIF(strpos($mode, 'withdelete') === false)->andWhere('deleted')->eq(0)->fi()
             ->beginIF(!$this->app->user->admin and strpos($mode, 'all') === false)->andWhere('id')->in($this->app->user->view->sprints)->fi()
             ->orderBy($orderBy)
-            ->fetchAll();
+            ->fetchAll('id');
 
         /* If mode == leaf, only show leaf executions. */
-        $allExecutions = $this->dao->select('id,name,parent')->from(TABLE_EXECUTION)
+        $allExecutions = $this->dao->select('id,name,parent,grade')->from(TABLE_EXECUTION)
             ->where('type')->notin(array('program', 'project'))
             ->andWhere('deleted')->eq('0')
             ->beginIf($projectID)->andWhere('project')->eq($projectID)->fi()
             ->fetchAll('id');
 
         $parents = array();
-        foreach($allExecutions as $exec)
-        {
-            $parents[$exec->parent] = true;
-        }
+        foreach($allExecutions as $exec) $parents[$exec->parent] = true;
+
+        if(strpos($mode, 'order_asc') !== false) $executions = $this->resetExecutionSorts($executions);
 
         $pairs       = array();
         $noMultiples = array();
@@ -1780,9 +1779,7 @@ class executionModel extends model
     {
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getExecutionPairs();
 
-        $project = $this->loadModel('project')->getByID($projectID);
-        $orderBy = (isset($project->model) and $project->model == 'waterfall') ? 'begin_asc,id_asc' : 'begin_desc,id_desc';
-
+        $project    = $this->loadModel('project')->getByID($projectID);
         $executions = $this->dao->select('*')->from(TABLE_EXECUTION)
             ->where('type')->in('stage,sprint,kanban')
             ->andWhere('deleted')->eq('0')
@@ -1794,12 +1791,12 @@ class executionModel extends model
             ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
             ->beginIF($devel === true)->andWhere('attribute')->in('dev,qa,release')->fi()
             ->beginIF($appendedID)->orWhere('id')->eq($appendedID)->fi()
-            ->orderBy($orderBy)
+            ->orderBy('order_asc')
             ->beginIF($limit)->limit($limit)->fi()
             ->fetchAll('id');
 
         /* Add product name and parent stage name to stage name. */
-        if(isset($project->model) and $project->model == 'waterfall')
+        if(isset($project->model) and in_array($project->model, array('waterfall', 'waterfallplus')))
         {
             $executionProducts = array();
             if($project->hasProduct and $project->division)
@@ -1812,8 +1809,8 @@ class executionModel extends model
                     ->fetchPairs();
             }
 
-            $allExecutions = $this->dao->select('id,name,parent')->from(TABLE_EXECUTION)
-                ->where('type')->eq('stage')
+            $allExecutions = $this->dao->select('id,name,parent,grade')->from(TABLE_EXECUTION)
+                ->where('type')->in('stage,sprint,kanban')
                 ->andWhere('deleted')->eq('0')
                 ->beginIf($projectID)->andWhere('project')->eq($projectID)->fi()
                 ->fetchAll('id');
@@ -1821,6 +1818,7 @@ class executionModel extends model
             $parents = array();
             foreach($allExecutions as $id => $execution) $parents[$execution->parent] = $execution->parent;
 
+            $executions = $this->resetExecutionSorts($executions);
             foreach($executions as $id => $execution)
             {
                 if(isset($parents[$execution->id]))
@@ -1836,7 +1834,6 @@ class executionModel extends model
                 if($executionName) $execution->name = ltrim($executionName, '/');
                 if(isset($executionProducts[$id])) $execution->name = $executionProducts[$id] . '/' . $execution->name;
             }
-
         }
 
         $projects = array();
@@ -5601,4 +5598,35 @@ class executionModel extends model
 
         return $executionIdList;
     }
+
+    /**
+     * Reset execution orders.
+     *
+     * @param  array  $executions
+     * @param  array  $parentExecutions
+     * @access public
+     * @return array
+     */
+    public function resetExecutionSorts($executions, $parentExecutions = array())
+    {
+        if(empty($parentExecutions))
+        {
+            $execution        = current($executions);
+            $parentExecutions = $this->dao->select('*')->from(TABLE_EXECUTION)
+                ->where('deleted')->eq(0)
+                ->andWhere('type')->in('kanban,sprint,stage')
+                ->andWhere('grade')->eq(1)
+                ->orderBy('order_asc')
+                ->fetchAll('id');
+        }
+
+        $sortedExecutions = array();
+        foreach($parentExecutions as $executionID => $execution)
+        {
+            $children = $this->getChildExecutions($executionID, 'order_asc');
+            if(!empty($children)) $sortedExecutions += $this->resetExecutionSorts($executions, $children);
+            if(!isset($sortedExecutions[$executionID]) and isset($executions[$executionID])) $sortedExecutions[$executionID] = $executions[$executionID];
+        }
+        return $sortedExecutions;
+    }
 }
diff --git a/module/product/model.php b/module/product/model.php
index f8108bc37a..db69c6d15d 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1464,10 +1464,9 @@ class productModel extends model
         /* Only show leaf executions. */
         $allExecutions = $this->dao->select('id,name,attribute,parent')->from(TABLE_EXECUTION)->where('type')->notin(array('program', 'project'))->fetchAll('id');
         $parents = array();
-        foreach($allExecutions as $exec)
-        {
-            $parents[$exec->parent] = true;
-        }
+        foreach($allExecutions as $exec) $parents[$exec->parent] = true;
+
+        if($projectID) $executions = $this->loadModel('execution')->resetExecutionSorts($executions);
 
         $executionPairs = array('0' => '');
         foreach($executions as $execID=> $execution)
@@ -1535,6 +1534,7 @@ class productModel extends model
             }
         }
 
+        if($projectID) $executions = $this->loadModel('execution')->resetExecutionSorts($executions);
         foreach($executions as $execution)
         {
             if(isset($execution->children))