diff --git a/workflow/engine/src/ProcessMaker/Project/Bpmn.php b/workflow/engine/src/ProcessMaker/Project/Bpmn.php
index 8cb27df25..cefce6f69 100755
--- a/workflow/engine/src/ProcessMaker/Project/Bpmn.php
+++ b/workflow/engine/src/ProcessMaker/Project/Bpmn.php
@@ -1348,13 +1348,15 @@ class Bpmn extends Handler
             $oCriteria->add( \BpmnFlowPeer::FLO_POSITION, $iPosition, '>' );
             $oDataset = \BpmnFlowPeer::doSelectRS( $oCriteria );
             $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
-            $oDataset->next();
-            $aRow = $oDataset->getRow();
-            $oCriteria2 = new Criteria('workflow');
-            $oCriteria2->add( \BpmnFlowPeer::FLO_POSITION, $aRow['FLO_POSITION'] - 1);
-            BasePeer::doUpdate($oCriteria, $oCriteria2, $con);
-            $oDataset->next();
-
+            while ($oDataset->next()) {
+                $aRow = $oDataset->getRow();
+                $newPosition = ((int)$aRow['FLO_POSITION'])-1;
+                $oCriteriaTemp = new Criteria( 'workflow' );
+                $oCriteriaTemp->add( \BpmnFlowPeer::FLO_UID, $aRow['FLO_UID'] );
+                $oCriteria2 = new Criteria('workflow');
+                $oCriteria2->add(\BpmnFlowPeer::FLO_POSITION, $newPosition);
+                BasePeer::doUpdate($oCriteriaTemp, $oCriteria2, $con);
+            }
         } catch (Exception $oException) {
             throw $oException;
         }
diff --git a/workflow/engine/templates/cases/cases_ScreenDerivation.html b/workflow/engine/templates/cases/cases_ScreenDerivation.html
index 6cb5122e2..4ad2fe413 100755
--- a/workflow/engine/templates/cases/cases_ScreenDerivation.html
+++ b/workflow/engine/templates/cases/cases_ScreenDerivation.html
@@ -68,8 +68,7 @@
                     </tr>
                 {else}
                     <tr>
-                        <td class="FormLabel" width="100"></td>
-                        <td class="FormFieldContent">{$data.NEXT_TASK.TAS_TITLE}{$data.NEXT_TASK.TAS_HIDDEN_FIELD}</td>
+                        <td class="FormFieldContent" colspan="2" style="text-align: center">{$data.NEXT_TASK.TAS_TITLE}{$data.NEXT_TASK.TAS_HIDDEN_FIELD}</td>
                     </tr>
                 {/if}
             {/if}
@@ -93,8 +92,7 @@
                         </tr>
                     {else}
                         <tr>
-                            <td class="FormLabel" width="100"></td>
-                            <td class="FormFieldContent">{$data.NEXT_TASK.USR_HIDDEN_FIELD}</td>
+                            <td class="FormFieldContent" colspan="2" style="text-align: center">{$data.NEXT_TASK.USR_HIDDEN_FIELD}</td>
                         </tr>
                     {/if}
                 {/if}