diff --git a/composite-envelope-builder/force-app/main/default/flows/Docusign_Envelope_Templates_V4.flow-meta.xml b/composite-envelope-builder/force-app/main/default/flows/Docusign_Envelope_Templates_V4.flow-meta.xml
index 1637b90..2784d76 100644
--- a/composite-envelope-builder/force-app/main/default/flows/Docusign_Envelope_Templates_V4.flow-meta.xml
+++ b/composite-envelope-builder/force-app/main/default/flows/Docusign_Envelope_Templates_V4.flow-meta.xml
@@ -4,7 +4,7 @@
         <name>Send_Composite_Envelope</name>
         <label>Send Composite Envelope</label>
         <locationX>182</locationX>
-        <locationY>1082</locationY>
+        <locationY>2498</locationY>
         <actionName>DocusignCompositeEnvelopeBuilder</actionName>
         <actionType>apex</actionType>
         <connector>
@@ -62,7 +62,7 @@
         <name>Add_Template_ID</name>
         <label>Add Template ID</label>
         <locationX>270</locationX>
-        <locationY>1106</locationY>
+        <locationY>2306</locationY>
         <assignmentItems>
             <assignToReference>compositeTemplateIds</assignToReference>
             <operator>Add</operator>
@@ -78,7 +78,7 @@
         <name>Flag_Auth_Release_Selected</name>
         <label>Flag Authorization to Release Template Selected</label>
         <locationX>270</locationX>
-        <locationY>1000</locationY>
+        <locationY>1514</locationY>
         <assignmentItems>
             <assignToReference>authReleaseTemplateSelected</assignToReference>
             <operator>Assign</operator>
@@ -93,8 +93,8 @@
     <assignments>
         <name>Store_Auth_Release_Copies</name>
         <label>Store Authorization to Release Copies Selection</label>
-        <locationX>182</locationX>
-        <locationY>1160</locationY>
+        <locationX>50</locationX>
+        <locationY>2006</locationY>
         <assignmentItems>
             <assignToReference>authReleaseFormCopies</assignToReference>
             <operator>Assign</operator>
@@ -109,24 +109,64 @@
     <assignments>
         <name>Store_SMS_Phone</name>
         <label>Store SMS Phone Number</label>
-        <locationX>842</locationX>
+        <locationX>479</locationX>
         <locationY>566</locationY>
         <assignmentItems>
             <assignToReference>recipientSmsPhone</assignToReference>
             <operator>Assign</operator>
             <value>
-                <elementReference>SMS_Phone_Screen.smsPhoneInput</elementReference>
+                <elementReference>smsPhoneInput</elementReference>
             </value>
         </assignmentItems>
         <connector>
             <targetReference>Is_Language_Selected</targetReference>
         </connector>
     </assignments>
+    <choices>
+        <name>AuthCopies_1</name>
+        <choiceText>1 copy</choiceText>
+        <dataType>Number</dataType>
+        <value>
+            <numberValue>1.0</numberValue>
+        </value>
+    </choices>
+    <choices>
+        <name>AuthCopies_2</name>
+        <choiceText>2 copies</choiceText>
+        <dataType>Number</dataType>
+        <value>
+            <numberValue>2.0</numberValue>
+        </value>
+    </choices>
+    <choices>
+        <name>AuthCopies_3</name>
+        <choiceText>3 copies</choiceText>
+        <dataType>Number</dataType>
+        <value>
+            <numberValue>3.0</numberValue>
+        </value>
+    </choices>
+    <choices>
+        <name>AuthCopies_4</name>
+        <choiceText>4 copies</choiceText>
+        <dataType>Number</dataType>
+        <value>
+            <numberValue>4.0</numberValue>
+        </value>
+    </choices>
+    <choices>
+        <name>AuthCopies_5</name>
+        <choiceText>5 copies</choiceText>
+        <dataType>Number</dataType>
+        <value>
+            <numberValue>5.0</numberValue>
+        </value>
+    </choices>
     <decisions>
         <name>Check_Envelope_Result</name>
         <label>Check Envelope Result</label>
         <locationX>182</locationX>
-        <locationY>1190</locationY>
+        <locationY>2606</locationY>
         <defaultConnector>
             <targetReference>Error_Screen</targetReference>
         </defaultConnector>
@@ -151,7 +191,7 @@
         <name>Check_Row_Selection</name>
         <label>Check Row Selection</label>
         <locationX>380</locationX>
-        <locationY>674</locationY>
+        <locationY>1190</locationY>
         <defaultConnector>
             <targetReference>Row_not_selected</targetReference>
         </defaultConnector>
@@ -172,11 +212,36 @@
             <label>Is Row Selected?</label>
         </rules>
     </decisions>
+    <decisions>
+        <name>Does_Row_Contain_Auth_Release</name>
+        <label>Does This Row Contain Authorization to Release Info?</label>
+        <locationX>402</locationX>
+        <locationY>1406</locationY>
+        <defaultConnector>
+            <targetReference>Scan_For_Auth_Release_Template</targetReference>
+        </defaultConnector>
+        <defaultConnectorLabel>No</defaultConnectorLabel>
+        <rules>
+            <name>Row_Is_Auth_Release_Template</name>
+            <conditionLogic>and</conditionLogic>
+            <conditions>
+                <leftValueReference>Scan_For_Auth_Release_Template.Name</leftValueReference>
+                <operator>Contains</operator>
+                <rightValue>
+                    <stringValue>Authorization to Release Information</stringValue>
+                </rightValue>
+            </conditions>
+            <connector>
+                <targetReference>Flag_Auth_Release_Selected</targetReference>
+            </connector>
+            <label>Yes</label>
+        </rules>
+    </decisions>
     <decisions>
         <name>Is_Auth_Release_Selected</name>
         <label>Is Authorization to Release Info Selected?</label>
-        <locationX>380</locationX>
-        <locationY>890</locationY>
+        <locationX>182</locationX>
+        <locationY>1790</locationY>
         <defaultConnector>
             <targetReference>Build_Template_ID_Collection</targetReference>
         </defaultConnector>
@@ -201,7 +266,7 @@
         <name>Is_Language_Selected</name>
         <label>Is Language Selected?</label>
         <locationX>611</locationX>
-        <locationY>458</locationY>
+        <locationY>758</locationY>
         <defaultConnector>
             <targetReference>Language_Not_Added_Screen</targetReference>
         </defaultConnector>
@@ -222,31 +287,6 @@
             <label>Language Selected?</label>
         </rules>
     </decisions>
-    <decisions>
-        <name>Does_Row_Contain_Auth_Release</name>
-        <label>Does This Row Contain Authorization to Release Info?</label>
-        <locationX>270</locationX>
-        <locationY>890</locationY>
-        <defaultConnector>
-            <targetReference>Scan_For_Auth_Release_Template</targetReference>
-        </defaultConnector>
-        <defaultConnectorLabel>No</defaultConnectorLabel>
-        <rules>
-            <name>Row_Is_Auth_Release_Template</name>
-            <conditionLogic>and</conditionLogic>
-            <conditions>
-                <leftValueReference>Scan_For_Auth_Release_Template.Name</leftValueReference>
-                <operator>Contains</operator>
-                <rightValue>
-                    <stringValue>Authorization to Release Information</stringValue>
-                </rightValue>
-            </conditions>
-            <connector>
-                <targetReference>Flag_Auth_Release_Selected</targetReference>
-            </connector>
-            <label>Yes</label>
-        </rules>
-    </decisions>
     <decisions>
         <name>Is_Recipient_Email_Blank</name>
         <label>Is Recipient Email Blank?</label>
@@ -286,7 +326,7 @@
         <name>Build_Template_ID_Collection</name>
         <label>Build Template ID Collection</label>
         <locationX>182</locationX>
-        <locationY>1214</locationY>
+        <locationY>2198</locationY>
         <collectionReference>data.selectedRows</collectionReference>
         <iterationOrder>Asc</iterationOrder>
         <nextValueConnector>
@@ -299,8 +339,8 @@
     <loops>
         <name>Scan_For_Auth_Release_Template</name>
         <label>Scan For Authorization to Release Template</label>
-        <locationX>380</locationX>
-        <locationY>782</locationY>
+        <locationX>182</locationX>
+        <locationY>1298</locationY>
         <collectionReference>data.selectedRows</collectionReference>
         <iterationOrder>Asc</iterationOrder>
         <nextValueConnector>
@@ -329,35 +369,11 @@
         </value>
     </processMetadataValues>
     <processType>Flow</processType>
-    <recordLookups>
-        <name>Get_Recipient_Contact</name>
-        <label>Get Recipient Contact</label>
-        <locationX>611</locationX>
-        <locationY>242</locationY>
-        <assignNullValuesIfNoRecordsFound>true</assignNullValuesIfNoRecordsFound>
-        <connector>
-            <targetReference>Is_Recipient_Email_Blank</targetReference>
-        </connector>
-        <filterLogic>and</filterLogic>
-        <filters>
-            <field>Id</field>
-            <operator>EqualTo</operator>
-            <value>
-                <elementReference>Get_Records.Docusign_Recipient_1__c</elementReference>
-            </value>
-        </filters>
-        <getFirstRecordOnly>true</getFirstRecordOnly>
-        <object>Contact</object>
-        <queriedFields>Id</queriedFields>
-        <queriedFields>Email</queriedFields>
-        <queriedFields>Name</queriedFields>
-        <storeOutputAutomatically>true</storeOutputAutomatically>
-    </recordLookups>
     <recordLookups>
         <name>DocuSign_Envelope_Templates</name>
         <label>DocuSign Envelope Templates</label>
         <locationX>380</locationX>
-        <locationY>458</locationY>
+        <locationY>974</locationY>
         <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
         <connector>
             <targetReference>Envelope_template_records</targetReference>
@@ -386,6 +402,30 @@
         <sortOrder>Asc</sortOrder>
         <storeOutputAutomatically>true</storeOutputAutomatically>
     </recordLookups>
+    <recordLookups>
+        <name>Get_Recipient_Contact</name>
+        <label>Get Recipient Contact</label>
+        <locationX>611</locationX>
+        <locationY>242</locationY>
+        <assignNullValuesIfNoRecordsFound>false</assignNullValuesIfNoRecordsFound>
+        <connector>
+            <targetReference>Is_Recipient_Email_Blank</targetReference>
+        </connector>
+        <filterLogic>and</filterLogic>
+        <filters>
+            <field>Id</field>
+            <operator>EqualTo</operator>
+            <value>
+                <elementReference>Get_Records.Docusign_Recipient_1__c</elementReference>
+            </value>
+        </filters>
+        <getFirstRecordOnly>true</getFirstRecordOnly>
+        <object>Contact</object>
+        <queriedFields>Id</queriedFields>
+        <queriedFields>Email</queriedFields>
+        <queriedFields>Name</queriedFields>
+        <storeOutputAutomatically>true</storeOutputAutomatically>
+    </recordLookups>
     <recordLookups>
         <name>Get_Records</name>
         <label>Get Records</label>
@@ -411,27 +451,52 @@
         <storeOutputAutomatically>true</storeOutputAutomatically>
     </recordLookups>
     <screens>
-        <name>SMS_Phone_Screen</name>
-        <label>Recipient Mobile Phone for SMS Delivery</label>
-        <locationX>842</locationX>
-        <locationY>458</locationY>
-        <allowBack>false</allowBack>
+        <name>Authorization_Copies_Screen</name>
+        <label>Authorization to Release Info - Number of Copies</label>
+        <locationX>50</locationX>
+        <locationY>1898</locationY>
+        <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
+        <backButtonLabel>Back</backButtonLabel>
         <connector>
-            <targetReference>Store_SMS_Phone</targetReference>
+            <targetReference>Store_Auth_Release_Copies</targetReference>
         </connector>
         <fields>
-            <name>SMS_Instructions_Text</name>
-            <fieldText>&lt;p&gt;The selected recipient ({!Get_Recipient_Contact.Name}) does not have an email address on file. The envelope will be delivered via &lt;strong&gt;SMS text message&lt;/strong&gt; instead.&lt;/p&gt;&lt;p&gt;Please enter the recipient&amp;apos;s mobile phone number in E.164 format (e.g. &lt;strong&gt;+15551234567&lt;/strong&gt;).&lt;/p&gt;</fieldText>
+            <name>AuthCopiesHeader</name>
+            <fieldText>&lt;p&gt;The &lt;strong&gt;Authorization to Release Information&lt;/strong&gt; form was selected.&lt;/p&gt;&lt;p&gt;How many copies of this form should be included in the envelope?&lt;/p&gt;</fieldText>
             <fieldType>DisplayText</fieldType>
+            <styleProperties>
+                <verticalAlignment>
+                    <stringValue>top</stringValue>
+                </verticalAlignment>
+                <width>
+                    <stringValue>12</stringValue>
+                </width>
+            </styleProperties>
         </fields>
         <fields>
-            <name>smsPhoneInput</name>
-            <dataType>String</dataType>
-            <fieldText>Recipient Mobile Phone Number</fieldText>
-            <fieldType>InputField</fieldType>
+            <name>authReleaseFormCopies_Radio</name>
+            <choiceReferences>AuthCopies_1</choiceReferences>
+            <choiceReferences>AuthCopies_2</choiceReferences>
+            <choiceReferences>AuthCopies_3</choiceReferences>
+            <choiceReferences>AuthCopies_4</choiceReferences>
+            <choiceReferences>AuthCopies_5</choiceReferences>
+            <dataType>Number</dataType>
+            <defaultSelectedChoiceReference>AuthCopies_1</defaultSelectedChoiceReference>
+            <fieldText>Number of Copies</fieldText>
+            <fieldType>RadioButtons</fieldType>
+            <inputsOnNextNavToAssocScrn>UseStoredValues</inputsOnNextNavToAssocScrn>
             <isRequired>true</isRequired>
+            <scale>0</scale>
+            <styleProperties>
+                <verticalAlignment>
+                    <stringValue>top</stringValue>
+                </verticalAlignment>
+                <width>
+                    <stringValue>12</stringValue>
+                </width>
+            </styleProperties>
         </fields>
         <nextOrFinishButtonLabel>Next</nextOrFinishButtonLabel>
         <showFooter>true</showFooter>
@@ -441,7 +506,7 @@
         <name>Envelope_template_records</name>
         <label>Envelope template records</label>
         <locationX>380</locationX>
-        <locationY>566</locationY>
+        <locationY>1082</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -503,62 +568,11 @@
         <showFooter>true</showFooter>
         <showHeader>true</showHeader>
     </screens>
-    <screens>
-        <name>Authorization_Copies_Screen</name>
-        <label>Authorization to Release Info - Number of Copies</label>
-        <locationX>182</locationX>
-        <locationY>1106</locationY>
-        <allowBack>true</allowBack>
-        <allowFinish>true</allowFinish>
-        <allowPause>false</allowPause>
-        <backButtonLabel>Back</backButtonLabel>
-        <connector>
-            <targetReference>Store_Auth_Release_Copies</targetReference>
-        </connector>
-        <fields>
-            <name>AuthCopiesHeader</name>
-            <fieldText>&lt;p&gt;The &lt;strong&gt;Authorization to Release Information&lt;/strong&gt; form was selected.&lt;/p&gt;&lt;p&gt;How many copies of this form should be included in the envelope?&lt;/p&gt;</fieldText>
-            <fieldType>DisplayText</fieldType>
-            <styleProperties>
-                <verticalAlignment>
-                    <stringValue>top</stringValue>
-                </verticalAlignment>
-                <width>
-                    <stringValue>12</stringValue>
-                </width>
-            </styleProperties>
-        </fields>
-        <fields>
-            <name>authReleaseFormCopies_Radio</name>
-            <choiceReferences>AuthCopies_1</choiceReferences>
-            <choiceReferences>AuthCopies_2</choiceReferences>
-            <choiceReferences>AuthCopies_3</choiceReferences>
-            <choiceReferences>AuthCopies_4</choiceReferences>
-            <choiceReferences>AuthCopies_5</choiceReferences>
-            <dataType>Number</dataType>
-            <defaultSelectedChoiceReference>AuthCopies_1</defaultSelectedChoiceReference>
-            <fieldText>Number of Copies</fieldText>
-            <fieldType>RadioButtons</fieldType>
-            <isRequired>true</isRequired>
-            <scale>0</scale>
-            <styleProperties>
-                <verticalAlignment>
-                    <stringValue>top</stringValue>
-                </verticalAlignment>
-                <width>
-                    <stringValue>12</stringValue>
-                </width>
-            </styleProperties>
-        </fields>
-        <nextOrFinishButtonLabel>Next</nextOrFinishButtonLabel>
-        <showFooter>true</showFooter>
-        <showHeader>true</showHeader>
-    </screens>
     <screens>
         <name>Error_Screen</name>
         <label>Error Screen</label>
         <locationX>314</locationX>
-        <locationY>1298</locationY>
+        <locationY>2714</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -583,7 +597,7 @@
         <name>Language_Not_Added_Screen</name>
         <label>Language Not Added Screen</label>
         <locationX>842</locationX>
-        <locationY>350</locationY>
+        <locationY>866</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -607,7 +621,7 @@
         <name>Language_Warning_Screen</name>
         <label>Language Warning Screen</label>
         <locationX>380</locationX>
-        <locationY>350</locationY>
+        <locationY>866</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -635,7 +649,7 @@
         <name>Row_not_selected</name>
         <label>Row not selected</label>
         <locationX>578</locationX>
-        <locationY>782</locationY>
+        <locationY>1298</locationY>
         <allowBack>true</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -656,11 +670,55 @@
         <showFooter>true</showFooter>
         <showHeader>false</showHeader>
     </screens>
+    <screens>
+        <name>SMS_Phone_Screen</name>
+        <label>Recipient Mobile Phone for SMS Delivery</label>
+        <locationX>479</locationX>
+        <locationY>458</locationY>
+        <allowBack>false</allowBack>
+        <allowFinish>true</allowFinish>
+        <allowPause>false</allowPause>
+        <connector>
+            <targetReference>Store_SMS_Phone</targetReference>
+        </connector>
+        <fields>
+            <name>SMS_Instructions_Text</name>
+            <fieldText>&lt;p&gt;The selected recipient ({!Get_Recipient_Contact.Name}) does not have an email address on file. The envelope will be delivered via &lt;strong&gt;SMS text message&lt;/strong&gt; instead.&lt;/p&gt;&lt;p&gt;Please enter the recipient&amp;apos;s mobile phone number in E.164 format (e.g. &lt;strong&gt;+15551234567&lt;/strong&gt;).&lt;/p&gt;</fieldText>
+            <fieldType>DisplayText</fieldType>
+            <styleProperties>
+                <verticalAlignment>
+                    <stringValue>top</stringValue>
+                </verticalAlignment>
+                <width>
+                    <stringValue>12</stringValue>
+                </width>
+            </styleProperties>
+        </fields>
+        <fields>
+            <name>smsPhoneInput</name>
+            <dataType>String</dataType>
+            <fieldText>Recipient Mobile Phone Number</fieldText>
+            <fieldType>InputField</fieldType>
+            <inputsOnNextNavToAssocScrn>UseStoredValues</inputsOnNextNavToAssocScrn>
+            <isRequired>true</isRequired>
+            <styleProperties>
+                <verticalAlignment>
+                    <stringValue>top</stringValue>
+                </verticalAlignment>
+                <width>
+                    <stringValue>12</stringValue>
+                </width>
+            </styleProperties>
+        </fields>
+        <nextOrFinishButtonLabel>Next</nextOrFinishButtonLabel>
+        <showFooter>true</showFooter>
+        <showHeader>true</showHeader>
+    </screens>
     <screens>
         <name>Success_Screen</name>
         <label>Success Screen</label>
         <locationX>50</locationX>
-        <locationY>1298</locationY>
+        <locationY>2714</locationY>
         <allowBack>false</allowBack>
         <allowFinish>true</allowFinish>
         <allowPause>false</allowPause>
@@ -688,6 +746,27 @@
         </connector>
     </start>
     <status>Draft</status>
+    <variables>
+        <name>authReleaseFormCopies</name>
+        <dataType>Number</dataType>
+        <isCollection>false</isCollection>
+        <isInput>false</isInput>
+        <isOutput>false</isOutput>
+        <scale>0</scale>
+        <value>
+            <numberValue>1.0</numberValue>
+        </value>
+    </variables>
+    <variables>
+        <name>authReleaseTemplateSelected</name>
+        <dataType>Boolean</dataType>
+        <isCollection>false</isCollection>
+        <isInput>false</isInput>
+        <isOutput>false</isOutput>
+        <value>
+            <booleanValue>false</booleanValue>
+        </value>
+    </variables>
     <variables>
         <name>compositeTemplateIds</name>
         <dataType>String</dataType>
@@ -716,34 +795,6 @@
         <isInput>false</isInput>
         <isOutput>false</isOutput>
     </variables>
-    <variables>
-        <name>recordId</name>
-        <dataType>String</dataType>
-        <isCollection>false</isCollection>
-        <isInput>true</isInput>
-        <isOutput>false</isOutput>
-    </variables>
-    <variables>
-        <name>authReleaseFormCopies</name>
-        <dataType>Number</dataType>
-        <isCollection>false</isCollection>
-        <isInput>false</isInput>
-        <isOutput>false</isOutput>
-        <scale>0</scale>
-        <value>
-            <numberValue>1.0</numberValue>
-        </value>
-    </variables>
-    <variables>
-        <name>authReleaseTemplateSelected</name>
-        <dataType>Boolean</dataType>
-        <isCollection>false</isCollection>
-        <isInput>false</isInput>
-        <isOutput>false</isOutput>
-        <value>
-            <booleanValue>false</booleanValue>
-        </value>
-    </variables>
     <variables>
         <name>recipientSmsPhone</name>
         <dataType>String</dataType>
@@ -751,44 +802,11 @@
         <isInput>false</isInput>
         <isOutput>false</isOutput>
     </variables>
-    <choices>
-        <name>AuthCopies_1</name>
-        <choiceText>1 copy</choiceText>
-        <dataType>Number</dataType>
-        <value>
-            <numberValue>1.0</numberValue>
-        </value>
-    </choices>
-    <choices>
-        <name>AuthCopies_2</name>
-        <choiceText>2 copies</choiceText>
-        <dataType>Number</dataType>
-        <value>
-            <numberValue>2.0</numberValue>
-        </value>
-    </choices>
-    <choices>
-        <name>AuthCopies_3</name>
-        <choiceText>3 copies</choiceText>
-        <dataType>Number</dataType>
-        <value>
-            <numberValue>3.0</numberValue>
-        </value>
-    </choices>
-    <choices>
-        <name>AuthCopies_4</name>
-        <choiceText>4 copies</choiceText>
-        <dataType>Number</dataType>
-        <value>
-            <numberValue>4.0</numberValue>
-        </value>
-    </choices>
-    <choices>
-        <name>AuthCopies_5</name>
-        <choiceText>5 copies</choiceText>
-        <dataType>Number</dataType>
-        <value>
-            <numberValue>5.0</numberValue>
-        </value>
-    </choices>
+    <variables>
+        <name>recordId</name>
+        <dataType>String</dataType>
+        <isCollection>false</isCollection>
+        <isInput>true</isInput>
+        <isOutput>false</isOutput>
+    </variables>
 </Flow>