diff --git a/src/components/WellShow/ConstructionInfo.tsx b/src/components/WellShow/ConstructionInfo.tsx
index df2200c7..6493ed70 100644
--- a/src/components/WellShow/ConstructionInfo.tsx
+++ b/src/components/WellShow/ConstructionInfo.tsx
@@ -54,16 +54,41 @@ const Section = ({ children }: { children: React.ReactNode }) => (
 const FieldRow = ({ label, value }: { label: string; value: string }) => (
   <Box
     sx={{
-      display: 'grid',
-      gridTemplateColumns: { xs: '1fr', sm: '170px 1fr' },
-      gap: 0.75,
-      alignItems: 'start',
+      position: 'relative',
+      border: 1,
+      borderColor: 'divider',
+      borderRadius: 1.5,
+      px: 1.5,
+      pt: 1.75,
+      pb: 1.25,
+      backgroundColor: 'background.paper',
     }}
   >
-    <Typography variant="caption" color="text.secondary" fontWeight={700}>
+    <Typography
+      variant="caption"
+      color="text.secondary"
+      fontWeight={700}
+      sx={{
+        position: 'absolute',
+        top: 0,
+        left: 10,
+        px: 0.5,
+        transform: 'translateY(-50%)',
+        backgroundColor: 'background.paper',
+        lineHeight: 1,
+      }}
+    >
       {label}
     </Typography>
-    <Typography variant="body2">{value}</Typography>
+    <Typography
+      variant="body2"
+      sx={{
+        whiteSpace: 'pre-line',
+        minHeight: '1.25rem',
+      }}
+    >
+      {value}
+    </Typography>
   </Box>
 )
 
@@ -78,7 +103,7 @@ const FieldGroup = ({
 }) => (
   <Box>
     <FieldRow label={label} value={value} />
-    <Box sx={{ pl: { xs: 0, sm: '170px' }, pt: 0.5 }}>
+    <Box sx={{ px: 1.5, pt: 0.5 }}>
       <Typography
         variant="body2"
         color="text.secondary"
diff --git a/src/components/WellShow/Equipment.tsx b/src/components/WellShow/Equipment.tsx
index 190ed5d1..e6b5f5ea 100644
--- a/src/components/WellShow/Equipment.tsx
+++ b/src/components/WellShow/Equipment.tsx
@@ -223,31 +223,31 @@ export const EquipmentAccordion = ({
                   }}
                 >
                   <DetailSection title="Sensor Details">
-                    <DetailRow
+                    <DetailField
                       label="Model"
                       value={selectedEquipment.sensor_model}
                     />
-                    <DetailRow
+                    <DetailField
                       label="Serial No"
                       value={selectedEquipment.serial_no}
                     />
                   </DetailSection>
 
                   <DetailSection title="Deployment">
-                    <DetailRow
+                    <DetailField
                       label="Install"
                       value={
                         formatAppDate(selectedEquipment.installation_date) ||
                         'N/A'
                       }
                     />
-                    <DetailRow
+                    <DetailField
                       label="Remove"
                       value={
                         formatAppDate(selectedEquipment.removal_date) || 'N/A'
                       }
                     />
-                    <DetailRow
+                    <DetailField
                       label="Cable Len."
                       value={
                         selectedEquipment.hanging_cable_length != null
@@ -258,7 +258,7 @@ export const EquipmentAccordion = ({
                   </DetailSection>
 
                   <DetailSection title="Recording">
-                    <DetailRow
+                    <DetailField
                       label="Interval"
                       value={
                         selectedEquipment.recording_interval_display || 'N/A'
@@ -267,12 +267,15 @@ export const EquipmentAccordion = ({
                   </DetailSection>
 
                   <DetailSection title="Notes">
-                    <Typography variant="body2" color="text.secondary">
-                      {selectedEquipment.notes &&
-                      selectedEquipment.notes !== '-'
-                        ? selectedEquipment.notes
-                        : 'N/A'}
-                    </Typography>
+                    <DetailField
+                      label="Notes"
+                      value={
+                        selectedEquipment.notes &&
+                        selectedEquipment.notes !== '-'
+                          ? selectedEquipment.notes
+                          : 'N/A'
+                      }
+                    />
                   </DetailSection>
                 </Box>
               </Stack>
@@ -303,25 +306,41 @@ const DetailSection = ({
   </Box>
 )
 
-const DetailRow = ({ label, value }: { label: string; value: string }) => (
+const DetailField = ({ label, value }: { label: string; value: string }) => (
   <Box
     sx={{
-      display: 'grid',
-      gridTemplateColumns: '1fr',
-      gap: 0.75,
-      alignItems: 'start',
+      position: 'relative',
+      border: 1,
+      borderColor: 'divider',
+      borderRadius: 1.5,
+      px: 1.5,
+      pt: 1.75,
+      pb: 1.25,
+      backgroundColor: 'background.paper',
       minWidth: 0,
     }}
   >
-    <Typography variant="caption" color="text.secondary" fontWeight={700}>
+    <Typography
+      variant="caption"
+      color="text.secondary"
+      fontWeight={700}
+      sx={{
+        position: 'absolute',
+        top: 0,
+        left: 10,
+        px: 0.5,
+        transform: 'translateY(-50%)',
+        backgroundColor: 'background.paper',
+        lineHeight: 1,
+      }}
+    >
       {label}
     </Typography>
     <Typography
       variant="body2"
       sx={{
-        whiteSpace: 'nowrap',
-        overflow: 'hidden',
-        textOverflow: 'ellipsis',
+        whiteSpace: 'pre-line',
+        minHeight: '1.25rem',
         minWidth: 0,
       }}
     >
diff --git a/src/components/WellShow/GeologyInformation.tsx b/src/components/WellShow/GeologyInformation.tsx
index c21e9200..b84b3be8 100644
--- a/src/components/WellShow/GeologyInformation.tsx
+++ b/src/components/WellShow/GeologyInformation.tsx
@@ -10,40 +10,71 @@ export const GeologyInformationAccordion = ({ well }: { well?: IWell }) => {
         </Typography>
       </Box>
       <Box sx={{ p: 2 }}>
-        <Stack spacing={2}>
-          <Box sx={{ display: 'flex', gap: 1, alignItems: 'baseline' }}>
-            <Typography variant="body2" component="span">
-              Formation Completion Code:
-            </Typography>
-            <Typography variant="body2" color="text.secondary" component="span">
-              {well?.formation_completion_code || 'N/A'}
-            </Typography>
-          </Box>
-          <Box sx={{ display: 'flex', gap: 1, alignItems: 'baseline', flexWrap: 'wrap' }}>
-            <Typography variant="body2" component="span">
-              Aquifer Systems:
-            </Typography>
-            <Typography variant="body2" color="text.secondary" component="span">
-              {(well?.aquifers ?? [])
+        <Stack spacing={1.25}>
+          <FieldRow
+            label="Formation Completion Code"
+            value={well?.formation_completion_code || 'N/A'}
+          />
+          <FieldRow
+            label="Aquifer Systems"
+            value={
+              (well?.aquifers ?? [])
                 ?.map((a) => a?.aquifer_system)
                 ?.filter(Boolean)
-                ?.join(', ') || 'N/A'}
-            </Typography>
-          </Box>
-          <Box sx={{ display: 'flex', gap: 1, alignItems: 'baseline', flexWrap: 'wrap' }}>
-            <Typography variant="body2" component="span">
-              Aquifer Types:
-            </Typography>
-            <Typography variant="body2" color="text.secondary" component="span">
-              {well?.aquifers && well.aquifers.length > 0
-                ? [
-                    ...new Set(well.aquifers.flatMap((a) => a.aquifer_types)),
-                  ].join(', ')
-                : 'N/A'}
-            </Typography>
-          </Box>
+                ?.join(', ') || 'N/A'
+            }
+          />
+          <FieldRow
+            label="Aquifer Types"
+            value={
+              well?.aquifers && well.aquifers.length > 0
+                ? [...new Set(well.aquifers.flatMap((a) => a.aquifer_types))].join(', ')
+                : 'N/A'
+            }
+          />
         </Stack>
       </Box>
     </Paper>
   )
 }
+
+const FieldRow = ({ label, value }: { label: string; value: string }) => (
+  <Box
+    sx={{
+      position: 'relative',
+      border: 1,
+      borderColor: 'divider',
+      borderRadius: 1.5,
+      px: 1.5,
+      pt: 1.75,
+      pb: 1.25,
+      backgroundColor: 'background.paper',
+    }}
+  >
+    <Typography
+      variant="caption"
+      color="text.secondary"
+      fontWeight={700}
+      sx={{
+        position: 'absolute',
+        top: 0,
+        left: 10,
+        px: 0.5,
+        transform: 'translateY(-50%)',
+        backgroundColor: 'background.paper',
+        lineHeight: 1,
+      }}
+    >
+      {label}
+    </Typography>
+    <Typography
+      variant="body2"
+      sx={{
+        whiteSpace: 'pre-line',
+        minHeight: '1.25rem',
+      }}
+    >
+      {value}
+    </Typography>
+  </Box>
+)
diff --git a/src/components/WellShow/WellPhysicalProperties.tsx b/src/components/WellShow/WellPhysicalProperties.tsx
index 2a460f4e..3f57aa8e 100644
--- a/src/components/WellShow/WellPhysicalProperties.tsx
+++ b/src/components/WellShow/WellPhysicalProperties.tsx
@@ -10,56 +10,73 @@ export const WellPhysicalPropertiesAccordion = ({ well }: { well?: IWell }) => {
         </Typography>
       </Box>
       <Box sx={{ p: 2 }}>
-      <Stack spacing={1}>
-        <Box sx={{ display: 'flex', gap: 1, alignItems: 'baseline' }}>
-          <Typography variant="body2" component="span">
-            Casing Diameter:
-          </Typography>
-          <Typography variant="body2" color="text.secondary" component="span">
-            {well?.well_casing_diameter?.toFixed(2) || 'N/A'}
-            {well?.well_casing_diameter
-              ? ` ${well?.well_casing_diameter_unit}`
-              : null}
-          </Typography>
-        </Box>
-        <Box sx={{ display: 'flex', gap: 1, alignItems: 'baseline' }}>
-          <Typography variant="body2" component="span">
-            Casing Depth:
-          </Typography>
-          <Typography variant="body2" color="text.secondary" component="span">
-            {well?.well_casing_depth?.toFixed(2) || 'N/A'}
-            {well?.well_casing_depth
-              ? ` ${well?.well_casing_depth_unit}`
-              : null}
-          </Typography>
-        </Box>
-        <Box sx={{ display: 'flex', gap: 1, alignItems: 'baseline' }}>
-          <Typography variant="body2" component="span">
-            Casing Materials:
-          </Typography>
-          <Typography variant="body2" color="text.secondary" component="span">
-            {well?.well_casing_materials?.join(', ') || 'N/A'}
-          </Typography>
-        </Box>
-        <Box sx={{ display: 'flex', gap: 1, alignItems: 'baseline' }}>
-          <Typography variant="body2" component="span">
-            Pump Type:
-          </Typography>
-          <Typography variant="body2" color="text.secondary" component="span">
-            {well?.well_pump_type || 'N/A'}
-          </Typography>
-        </Box>
-        <Box sx={{ display: 'flex', gap: 1, alignItems: 'baseline' }}>
-          <Typography variant="body2" component="span">
-            Pump Depth:
-          </Typography>
-          <Typography variant="body2" color="text.secondary" component="span">
-            {well?.well_pump_depth?.toFixed(2) || 'N/A'}
-            {well?.well_pump_depth ? ` ${well?.well_pump_depth_unit}` : null}
-          </Typography>
-        </Box>
-      </Stack>
+        <Stack spacing={1.25}>
+          <FieldRow
+            label="Casing Diameter"
+            value={`${well?.well_casing_diameter?.toFixed(2) || 'N/A'}${
+              well?.well_casing_diameter ? ` ${well?.well_casing_diameter_unit}` : ''
+            }`}
+          />
+          <FieldRow
+            label="Casing Depth"
+            value={`${well?.well_casing_depth?.toFixed(2) || 'N/A'}${
+              well?.well_casing_depth ? ` ${well?.well_casing_depth_unit}` : ''
+            }`}
+          />
+          <FieldRow
+            label="Casing Materials"
+            value={well?.well_casing_materials?.join(', ') || 'N/A'}
+          />
+          <FieldRow label="Pump Type" value={well?.well_pump_type || 'N/A'} />
+          <FieldRow
+            label="Pump Depth"
+            value={`${well?.well_pump_depth?.toFixed(2) || 'N/A'}${
+              well?.well_pump_depth ? ` ${well?.well_pump_depth_unit}` : ''
+            }`}
+          />
+        </Stack>
       </Box>
     </Paper>
   )
 }
+
+const FieldRow = ({ label, value }: { label: string; value: string }) => (
+  <Box
+    sx={{
+      position: 'relative',
+      border: 1,
+      borderColor: 'divider',
+      borderRadius: 1.5,
+      px: 1.5,
+      pt: 1.75,
+      pb: 1.25,
+      backgroundColor: 'background.paper',
+    }}
+  >
+    <Typography
+      variant="caption"
+      color="text.secondary"
+      fontWeight={700}
+      sx={{
+        position: 'absolute',
+        top: 0,
+        left: 10,
+        px: 0.5,
+        transform: 'translateY(-50%)',
+        backgroundColor: 'background.paper',
+        lineHeight: 1,
+      }}
+    >
+      {label}
+    </Typography>
+    <Typography
+      variant="body2"
+      sx={{
+        whiteSpace: 'pre-line',
+        minHeight: '1.25rem',
+      }}
+    >
+      {value}
+    </Typography>
+  </Box>
+)
diff --git a/src/components/card/CoreWellInfo.tsx b/src/components/card/CoreWellInfo.tsx
index 12e85316..511e2cba 100644
--- a/src/components/card/CoreWellInfo.tsx
+++ b/src/components/card/CoreWellInfo.tsx
@@ -104,16 +104,8 @@ export const CoreWellInfoCard = ({ well }: { well: IWell }) => {
                 ) : null
               }
             >
-              <InfoRow
-                label="Latitude / Longitude"
-                value={latLonValue}
-                copyValue={latLonValue !== 'N/A' ? latLonValue : undefined}
-              />
-              <InfoRow
-                label="Easting / Northing"
-                value={utmValue}
-                copyValue={utmValue !== 'N/A' ? utmValue : undefined}
-              />
+              <InfoRow label="Latitude / Longitude" value={latLonValue} />
+              <InfoRow label="Easting / Northing" value={utmValue} />
               <InfoRow
                 label="Coordinate Notes"
                 value={
@@ -223,13 +215,30 @@ const InfoRow = ({
   return (
     <Box
       sx={{
-        display: 'grid',
-        gridTemplateColumns: { xs: '1fr', sm: '132px 1fr' },
-        gap: 0.75,
-        alignItems: 'start',
+        position: 'relative',
+        border: 1,
+        borderColor: 'divider',
+        borderRadius: 1.5,
+        px: 1.5,
+        pt: 1.75,
+        pb: 1.25,
+        backgroundColor: 'background.paper',
       }}
     >
-      <Typography variant="caption" color="text.secondary" fontWeight={700}>
+      <Typography
+        variant="caption"
+        color="text.secondary"
+        fontWeight={700}
+        sx={{
+          position: 'absolute',
+          top: 0,
+          left: 10,
+          px: 0.5,
+          transform: 'translateY(-50%)',
+          backgroundColor: 'background.paper',
+          lineHeight: 1,
+        }}
+      >
         {label}
       </Typography>
       <Box
@@ -240,7 +249,15 @@ const InfoRow = ({
           alignItems: 'center',
         }}
       >
-        <Typography variant="body2">{value}</Typography>
+        <Typography
+          variant="body2"
+          sx={{
+            whiteSpace: 'pre-line',
+            minHeight: '1.25rem',
+          }}
+        >
+          {value}
+        </Typography>
         <Box
           sx={{
             width: 24,
diff --git a/src/components/card/RecentWaterLevelObservations.tsx b/src/components/card/RecentWaterLevelObservations.tsx
index 7d31912a..28ad5260 100644
--- a/src/components/card/RecentWaterLevelObservations.tsx
+++ b/src/components/card/RecentWaterLevelObservations.tsx
@@ -41,7 +41,6 @@ export const RecentWaterLevelObservationsCard = ({
         type: 'number',
         minWidth: 150,
       },
-      { field: 'release_status', headerName: 'Release Status', minWidth: 150 },
       { field: 'level_status', headerName: 'Level Status', minWidth: 150 },
     ]
   }, [])
diff --git a/src/resources/ocotillo.tsx b/src/resources/ocotillo.tsx
index 5380310d..4be21108 100644
--- a/src/resources/ocotillo.tsx
+++ b/src/resources/ocotillo.tsx
@@ -1,7 +1,7 @@
 import {
   Apps,
   Construction,
-  DatasetLinked,
+  DatasetOutlined,
   Contacts,
   DynamicFormOutlined,
   Image,
@@ -312,7 +312,7 @@ let ocotillo = [
     list: '/ocotillo/collections',
     meta: {
       label: 'Datasets',
-      icon: <DatasetLinked />,
+      icon: <DatasetOutlined />,
     },
   },
   ...tables,