diff --git a/force-app/main/default/email/SA_Fax_Templates/Approved_Fax_Template.email b/force-app/main/default/email/SA_Fax_Templates/Approved_Fax_Template.email
index df22af416..2df9aab94 100644
--- a/force-app/main/default/email/SA_Fax_Templates/Approved_Fax_Template.email
+++ b/force-app/main/default/email/SA_Fax_Templates/Approved_Fax_Template.email
@@ -37,7 +37,8 @@ Description: {!Case.Description}<br><br><br><br>
 
 <center><strong>APPROVED</strong></center><br>
 Effective Date: {!Case.Effective_Date__c}<br>
-Termination Date: {!Case.Termination_Date__c} Max. Days Supply (if applicable): {!Case. Max_Days_Supply__c}<br><br>
+Termination Date: {!Case.Termination_Date__c} <br>
+Max. Days Supply (if applicable): {!Case. Max_Days_Supply__c}<br><br><br>
 <strong>PharmaCare comments:</strong><br>
 {!Case.Rationale__c}<br><br>{!Case.ESA_General_Stamps__c}<br><br>{!Case.ESA_Super_Stamp__c}<br><br>
 
diff --git a/force-app/main/default/flexipages/SA_Case_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/SA_Case_Record_Page.flexipage-meta.xml
index afc1e4389..b0133aaa9 100644
--- a/force-app/main/default/flexipages/SA_Case_Record_Page.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/SA_Case_Record_Page.flexipage-meta.xml
@@ -721,6 +721,34 @@
         <name>Facet-5bd2d877-fec6-4738-ac36-7435d98c48a1</name>
         <type>Facet</type>
     </flexiPageRegions>
+    <flexiPageRegions>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>isSuperStamp</name>
+                    <value>false</value>
+                </componentInstanceProperties>
+                <componentName>esa_LC_SuperStamps</componentName>
+                <identifier>c_esa_LC_SuperStamps</identifier>
+            </componentInstance>
+        </itemInstances>
+        <name>Facet-33b90ebc-7ea0-4708-8b5d-e9c3b7aa7c21</name>
+        <type>Facet</type>
+    </flexiPageRegions>
+    <flexiPageRegions>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>isSuperStamp</name>
+                    <value>true</value>
+                </componentInstanceProperties>
+                <componentName>esa_LC_SuperStamps</componentName>
+                <identifier>c_esa_LC_SuperStamps2</identifier>
+            </componentInstance>
+        </itemInstances>
+        <name>Facet-4l49oq5b7zj</name>
+        <type>Facet</type>
+    </flexiPageRegions>
     <flexiPageRegions>
         <itemInstances>
             <componentInstance>
@@ -764,6 +792,34 @@
                 <identifier>flexipage_tab15</identifier>
             </componentInstance>
         </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>body</name>
+                    <value>Facet-33b90ebc-7ea0-4708-8b5d-e9c3b7aa7c21</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>title</name>
+                    <value>General Stamps</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:tab</componentName>
+                <identifier>flexipage_tab</identifier>
+            </componentInstance>
+        </itemInstances>
+        <itemInstances>
+            <componentInstance>
+                <componentInstanceProperties>
+                    <name>body</name>
+                    <value>Facet-4l49oq5b7zj</value>
+                </componentInstanceProperties>
+                <componentInstanceProperties>
+                    <name>title</name>
+                    <value>Super Stamps</value>
+                </componentInstanceProperties>
+                <componentName>flexipage:tab</componentName>
+                <identifier>flexipage_tab16</identifier>
+            </componentInstance>
+        </itemInstances>
         <name>Facet-2d3f0fe9-a5c9-4f62-8dd3-81b6a5d64d55</name>
         <type>Facet</type>
     </flexiPageRegions>
diff --git a/force-app/main/default/layouts/ESA_CMD_General_Stamps__mdt-General Stamps Layout.layout-meta.xml b/force-app/main/default/layouts/ESA_CMD_General_Stamps__mdt-General Stamps Layout.layout-meta.xml
new file mode 100644
index 000000000..41cdafadd
--- /dev/null
+++ b/force-app/main/default/layouts/ESA_CMD_General_Stamps__mdt-General Stamps Layout.layout-meta.xml	
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Layout xmlns="http://soap.sforce.com/2006/04/metadata">
+    <layoutSections>
+        <customLabel>false</customLabel>
+        <detailHeading>false</detailHeading>
+        <editHeading>true</editHeading>
+        <label>Information</label>
+        <layoutColumns>
+            <layoutItems>
+                <behavior>Required</behavior>
+                <field>MasterLabel</field>
+            </layoutItems>
+            <layoutItems>
+                <behavior>Required</behavior>
+                <field>DeveloperName</field>
+            </layoutItems>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>ESA_Stamp_Text__c</field>
+            </layoutItems>
+        </layoutColumns>
+        <layoutColumns>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>IsProtected</field>
+            </layoutItems>
+            <layoutItems>
+                <behavior>Required</behavior>
+                <field>NamespacePrefix</field>
+            </layoutItems>
+        </layoutColumns>
+        <style>TwoColumnsTopToBottom</style>
+    </layoutSections>
+    <layoutSections>
+        <customLabel>false</customLabel>
+        <detailHeading>false</detailHeading>
+        <editHeading>true</editHeading>
+        <label>System Information</label>
+        <layoutColumns>
+            <layoutItems>
+                <behavior>Readonly</behavior>
+                <field>CreatedById</field>
+            </layoutItems>
+        </layoutColumns>
+        <layoutColumns>
+            <layoutItems>
+                <behavior>Readonly</behavior>
+                <field>LastModifiedById</field>
+            </layoutItems>
+        </layoutColumns>
+        <style>TwoColumnsTopToBottom</style>
+    </layoutSections>
+    <layoutSections>
+        <customLabel>false</customLabel>
+        <detailHeading>false</detailHeading>
+        <editHeading>false</editHeading>
+        <layoutColumns/>
+        <style>CustomLinks</style>
+    </layoutSections>
+    <showEmailCheckbox>false</showEmailCheckbox>
+    <showHighlightsPanel>false</showHighlightsPanel>
+    <showInteractionLogPanel>false</showInteractionLogPanel>
+    <showRunAssignmentRulesCheckbox>false</showRunAssignmentRulesCheckbox>
+    <showSubmitAndAttachButton>false</showSubmitAndAttachButton>
+</Layout>
diff --git a/force-app/main/default/layouts/ESA_CMD_Super_Stamps__mdt-Super Stamps Layout.layout-meta.xml b/force-app/main/default/layouts/ESA_CMD_Super_Stamps__mdt-Super Stamps Layout.layout-meta.xml
new file mode 100644
index 000000000..94e5844d7
--- /dev/null
+++ b/force-app/main/default/layouts/ESA_CMD_Super_Stamps__mdt-Super Stamps Layout.layout-meta.xml	
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Layout xmlns="http://soap.sforce.com/2006/04/metadata">
+    <layoutSections>
+        <customLabel>false</customLabel>
+        <detailHeading>false</detailHeading>
+        <editHeading>true</editHeading>
+        <label>Information</label>
+        <layoutColumns>
+            <layoutItems>
+                <behavior>Required</behavior>
+                <field>MasterLabel</field>
+            </layoutItems>
+            <layoutItems>
+                <behavior>Required</behavior>
+                <field>DeveloperName</field>
+            </layoutItems>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>ESA_Drug_Name__c</field>
+            </layoutItems>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>ESA_Super_Stamp__c</field>
+            </layoutItems>
+        </layoutColumns>
+        <layoutColumns>
+            <layoutItems>
+                <behavior>Edit</behavior>
+                <field>IsProtected</field>
+            </layoutItems>
+            <layoutItems>
+                <behavior>Required</behavior>
+                <field>NamespacePrefix</field>
+            </layoutItems>
+        </layoutColumns>
+        <style>TwoColumnsTopToBottom</style>
+    </layoutSections>
+    <layoutSections>
+        <customLabel>false</customLabel>
+        <detailHeading>false</detailHeading>
+        <editHeading>true</editHeading>
+        <label>System Information</label>
+        <layoutColumns>
+            <layoutItems>
+                <behavior>Readonly</behavior>
+                <field>CreatedById</field>
+            </layoutItems>
+        </layoutColumns>
+        <layoutColumns>
+            <layoutItems>
+                <behavior>Readonly</behavior>
+                <field>LastModifiedById</field>
+            </layoutItems>
+        </layoutColumns>
+        <style>TwoColumnsTopToBottom</style>
+    </layoutSections>
+    <layoutSections>
+        <customLabel>true</customLabel>
+        <detailHeading>true</detailHeading>
+        <editHeading>false</editHeading>
+        <label>Custom Links</label>
+        <layoutColumns/>
+        <layoutColumns/>
+        <layoutColumns/>
+        <style>CustomLinks</style>
+    </layoutSections>
+    <showEmailCheckbox>false</showEmailCheckbox>
+    <showHighlightsPanel>false</showHighlightsPanel>
+    <showInteractionLogPanel>false</showInteractionLogPanel>
+    <showRunAssignmentRulesCheckbox>false</showRunAssignmentRulesCheckbox>
+    <showSubmitAndAttachButton>false</showSubmitAndAttachButton>
+    <summaryLayout>
+        <masterLabel>00hAu0000018KIj</masterLabel>
+        <sizeX>4</sizeX>
+        <sizeY>0</sizeY>
+        <summaryLayoutStyle>Default</summaryLayoutStyle>
+    </summaryLayout>
+</Layout>