diff --git a/cumulusci.yml b/cumulusci.yml
index 84774e13..ddf324c7 100644
--- a/cumulusci.yml
+++ b/cumulusci.yml
@@ -75,4 +75,4 @@ orgs:
     dev:
       days: 30
       config_file: config/dev-scratch-def.json
-      namespaced: "True"
+      namespaced: True
diff --git a/force-app/main/default/flexipages/Animal_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/Animal_Record_Page.flexipage-meta.xml
index 092f8012..dd7c8ae6 100644
--- a/force-app/main/default/flexipages/Animal_Record_Page.flexipage-meta.xml
+++ b/force-app/main/default/flexipages/Animal_Record_Page.flexipage-meta.xml
@@ -162,6 +162,16 @@
                 <identifier>RecordEstimated_Age__cField</identifier>
             </fieldInstance>
         </itemInstances>
+        <itemInstances>
+            <fieldInstance>
+                <fieldInstanceProperties>
+                    <name>uiBehavior</name>
+                    <value>none</value>
+                </fieldInstanceProperties>
+                <fieldItem>Record.Calculated_Age__c</fieldItem>
+                <identifier>RecordCalculated_Age__cField</identifier>
+            </fieldInstance>
+        </itemInstances>
         <name>Facet-4c49db03-428d-4fcb-a44e-6e9be7ede66a</name>
         <type>Facet</type>
     </flexiPageRegions>
@@ -192,8 +202,8 @@
                     <name>uiBehavior</name>
                     <value>none</value>
                 </fieldInstanceProperties>
-                <fieldItem>Record.Date_of_Birth__c</fieldItem>
-                <identifier>RecordDate_of_Birth__cField</identifier>
+                <fieldItem>Record.Current_Weight_ibs__c</fieldItem>
+                <identifier>Recordanimalshelters_Current_Weight_ibs_cField</identifier>
             </fieldInstance>
         </itemInstances>
         <itemInstances>
@@ -202,8 +212,8 @@
                     <name>uiBehavior</name>
                     <value>none</value>
                 </fieldInstanceProperties>
-                <fieldItem>Record.Calculated_Age__c</fieldItem>
-                <identifier>RecordCalculated_Age__cField</identifier>
+                <fieldItem>Record.Date_of_Birth__c</fieldItem>
+                <identifier>RecordDate_of_Birth__cField</identifier>
             </fieldInstance>
         </itemInstances>
         <itemInstances>
diff --git a/force-app/main/default/globalValueSets/Animal_Type.globalValueSet-meta.xml b/force-app/main/default/globalValueSets/Animal_Type.globalValueSet-meta.xml
index a64c0d63..9689050e 100644
--- a/force-app/main/default/globalValueSets/Animal_Type.globalValueSet-meta.xml
+++ b/force-app/main/default/globalValueSets/Animal_Type.globalValueSet-meta.xml
@@ -81,16 +81,16 @@
         <label>Rat</label>
     </customValue>
     <customValue>
-        <fullName>Fish</fullName>
+        <fullName>Reptile</fullName>
         <default>false</default>
         <isActive>false</isActive>
-        <label>Fish</label>
+        <label>Reptile</label>
     </customValue>
     <customValue>
-        <fullName>Reptile</fullName>
+        <fullName>Fish</fullName>
         <default>false</default>
         <isActive>false</isActive>
-        <label>Reptile</label>
+        <label>Fish</label>
     </customValue>
     <description>[Animal Shelter] Types of Animals</description>
     <masterLabel>Animal Type</masterLabel>
diff --git a/force-app/main/default/layouts/Animal__c-Animal Layout.layout-meta.xml b/force-app/main/default/layouts/Animal__c-Animal Layout.layout-meta.xml
index 0eeb63cc..8aa7834b 100644
--- a/force-app/main/default/layouts/Animal__c-Animal Layout.layout-meta.xml	
+++ b/force-app/main/default/layouts/Animal__c-Animal Layout.layout-meta.xml	
@@ -31,6 +31,10 @@
                 <behavior>Readonly</behavior>
                 <field>Age_Category__c</field>
             </layoutItems>
+            <layoutItems>
+                <behavior>Readonly</behavior>
+                <field>Current_Weight_ibs__c</field>
+            </layoutItems>
         </layoutColumns>
         <layoutColumns>
             <layoutItems>
@@ -374,11 +378,6 @@
             <actionType>QuickAction</actionType>
             <sortOrder>13</sortOrder>
         </platformActionListItems>
-        <platformActionListItems>
-            <actionName>NewCase</actionName>
-            <actionType>QuickAction</actionType>
-            <sortOrder>14</sortOrder>
-        </platformActionListItems>
         <platformActionListItems>
             <actionName>PrintableView</actionName>
             <actionType>StandardButton</actionType>
@@ -409,6 +408,11 @@
             <actionType>QuickAction</actionType>
             <sortOrder>6</sortOrder>
         </platformActionListItems>
+        <platformActionListItems>
+            <actionName>NewCase</actionName>
+            <actionType>QuickAction</actionType>
+            <sortOrder>14</sortOrder>
+        </platformActionListItems>
     </platformActionList>
     <quickActionList>
         <quickActionListItems>
diff --git a/force-app/main/default/objectTranslations/Animal__c-de/Current_Weight_ibs__c.fieldTranslation-meta.xml b/force-app/main/default/objectTranslations/Animal__c-de/Current_Weight_ibs__c.fieldTranslation-meta.xml
new file mode 100644
index 00000000..9300ae81
--- /dev/null
+++ b/force-app/main/default/objectTranslations/Animal__c-de/Current_Weight_ibs__c.fieldTranslation-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomFieldTranslation xmlns="http://soap.sforce.com/2006/04/metadata">
+    <label></label>
+    <name>Current_Weight_ibs__c</name>
+</CustomFieldTranslation>
diff --git a/force-app/main/default/objectTranslations/Animal__c-es/Current_Weight_ibs__c.fieldTranslation-meta.xml b/force-app/main/default/objectTranslations/Animal__c-es/Current_Weight_ibs__c.fieldTranslation-meta.xml
new file mode 100644
index 00000000..9300ae81
--- /dev/null
+++ b/force-app/main/default/objectTranslations/Animal__c-es/Current_Weight_ibs__c.fieldTranslation-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomFieldTranslation xmlns="http://soap.sforce.com/2006/04/metadata">
+    <label></label>
+    <name>Current_Weight_ibs__c</name>
+</CustomFieldTranslation>
diff --git a/force-app/main/default/objectTranslations/Animal__c-it/Current_Weight_ibs__c.fieldTranslation-meta.xml b/force-app/main/default/objectTranslations/Animal__c-it/Current_Weight_ibs__c.fieldTranslation-meta.xml
new file mode 100644
index 00000000..9300ae81
--- /dev/null
+++ b/force-app/main/default/objectTranslations/Animal__c-it/Current_Weight_ibs__c.fieldTranslation-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomFieldTranslation xmlns="http://soap.sforce.com/2006/04/metadata">
+    <label></label>
+    <name>Current_Weight_ibs__c</name>
+</CustomFieldTranslation>
diff --git a/force-app/main/default/objects/Animal__c/fields/Current_Weight__c.field-meta.xml b/force-app/main/default/objects/Animal__c/fields/Current_Weight__c.field-meta.xml
index 248c2f16..e33e7c27 100644
--- a/force-app/main/default/objects/Animal__c/fields/Current_Weight__c.field-meta.xml
+++ b/force-app/main/default/objects/Animal__c/fields/Current_Weight__c.field-meta.xml
@@ -2,9 +2,9 @@
 <CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Current_Weight__c</fullName>
     <externalId>false</externalId>
-    <inlineHelpText>The current weight of the animal. This field is tracked and changes will be logged in the Field History.</inlineHelpText>
-    <label>Current Weight</label>
-    <precision>5</precision>
+    <inlineHelpText>The current weight of the animal in KG. This field is tracked and changes will be logged in the Field History.</inlineHelpText>
+    <label>Current Weight (KG)</label>
+    <precision>7</precision>
     <required>false</required>
     <scale>2</scale>
     <trackHistory>true</trackHistory>
diff --git a/force-app/main/default/objects/Animal__c/fields/Current_Weight_ibs__c.field-meta.xml b/force-app/main/default/objects/Animal__c/fields/Current_Weight_ibs__c.field-meta.xml
new file mode 100644
index 00000000..38e3f7ef
--- /dev/null
+++ b/force-app/main/default/objects/Animal__c/fields/Current_Weight_ibs__c.field-meta.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fullName>Current_Weight_ibs__c</fullName>
+    <externalId>false</externalId>
+    <formula>Current_Weight__c * 2.205</formula>
+    <formulaTreatBlanksAs>BlankAsZero</formulaTreatBlanksAs>
+    <label>Current Weight (Ibs)</label>
+    <precision>18</precision>
+    <required>false</required>
+    <scale>2</scale>
+    <trackHistory>false</trackHistory>
+    <trackTrending>false</trackTrending>
+    <type>Number</type>
+    <unique>false</unique>
+</CustomField>