diff --git a/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css b/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css
index 90e148d659e..2c1ebf99492 100644
--- a/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css
+++ b/force-app/main/default/lwc/geDonationMatchingOpportunityCard/geDonationMatchingOpportunityCard.css
@@ -40,16 +40,12 @@
     width: 100%;
     padding: 0;
     margin: 0;
-    border-radius: none;
     padding-top: 0.25rem;
     padding-bottom: 0.25rem;
-    border: none;
-    border-radius: var(--slds-g-radius-border-2, 0.25rem);
 }
 
 .slds-border_extension-bottom {
     border-bottom: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
-    border-radius: none;
 }
 
 .slds-button:disabled {
diff --git a/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css b/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css
index 5065384b2e9..2f71190b677 100644
--- a/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css
+++ b/force-app/main/default/lwc/geDonationMatchingPaymentCard/geDonationMatchingPaymentCard.css
@@ -40,7 +40,6 @@
     width: 100%;
     padding: 0;
     margin: 0;
-    border-radius: none;
     padding-top: 0.25rem;
     padding-bottom: 0.25rem;
     border: none;
@@ -49,5 +48,4 @@
 
 .slds-border_extension-bottom {
     border-bottom: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-border-1, var(--lwc-colorBorder, rgb(221, 219, 218)));
-    border-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geListView/geListView.css b/force-app/main/default/lwc/geListView/geListView.css
index 6a6037184c3..bf1eb5f8902 100644
--- a/force-app/main/default/lwc/geListView/geListView.css
+++ b/force-app/main/default/lwc/geListView/geListView.css
@@ -6,8 +6,6 @@
 }
 
 .slds-page-header_extension {
-    background: var(--slds-g-color-surface-container-1, var(--lwc-colorBackgroundAlt, rgb(255, 255, 255)));
+    background: none;
     border-bottom: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, var(--lwc-colorBorderSeparatorAlt, rgb(221, 219, 218)));
-    border-bottom-left-radius: none;
-    border-bottom-right-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geListView/geListView.js b/force-app/main/default/lwc/geListView/geListView.js
index 9503a6086ad..0128c509dd4 100755
--- a/force-app/main/default/lwc/geListView/geListView.js
+++ b/force-app/main/default/lwc/geListView/geListView.js
@@ -286,6 +286,15 @@ export default class geListView extends LightningElement {
             });
 
         this.isLoading = false;
+
+        console.log('Test 1');
+        let style = document.createElement('style');
+        style.innerText = '.slds-table_header-fixed_container{border: 1px solid red;}';
+        let dt = this.template.querySelector('lightning-datatable');
+        if(dt) {
+            dt.appendChild(style);
+        }
+        console.log('Test 2');
     }
 
     /*******************************************************************************
diff --git a/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css b/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css
index b4b11223b6e..1164a841092 100644
--- a/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css
+++ b/force-app/main/default/lwc/geModalPrompt/geModalPrompt.css
@@ -1,4 +1,3 @@
 .slds-box_extension {
     border: none;
-    border-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css b/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css
index b4b11223b6e..1164a841092 100644
--- a/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css
+++ b/force-app/main/default/lwc/geModalRecurringDonation/geModalRecurringDonation.css
@@ -1,4 +1,3 @@
 .slds-box_extension {
     border: none;
-    border-radius: none;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css
index 2624df6ff29..1d28d620cde 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css
+++ b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.css
@@ -1,12 +1,11 @@
-.slds-card_extension {
-    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
-    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, rgb(221, 219, 218));
-}
-
 .slds-card_extension-widget {
     background-color: var(--slds-g-color-surface-3, #ECEBEA);
 }
 
 .vertical-align-center {
     margin: auto 0;
+}
+
+.input-padding {
+    padding: 0 4px 4px 4px;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.html b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.html
index a61b2c1d872..e95320fe238 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.html
+++ b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.html
@@ -4,7 +4,7 @@
             <div class="slds-grid slds-grid_vertical-align-end">
                 <template if:false={isWidget}>
                     <div class="slds-size_5-of-12 slds-p-right_small">
-                        <lightning-input class="slds-truncate"
+                        <lightning-input class="slds-truncate input-padding"
                                          data-name="customLabel"
                                          field-level-help={labelHelpText}
                                          label={field.label}
@@ -35,7 +35,7 @@
                             </c-util-input>
                         </template>
                     </div>
-                    <div class="slds-size_1-of-12 slds-p-left_large slds-p-bottom_x-small">
+                    <div class="slds-size_1-of-12 slds-p-left_large slds-p-bottom_small">
                         <template if:true={showRequiredCheckbox}>
                             <lightning-input aria-label={labelGeAssistiveRequireField}
                                              aria-describedby="requiredCheckboxDescription"
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.js b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.js
index 5eefd4dee59..bf32d324184 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.js
+++ b/force-app/main/default/lwc/geTemplateBuilderFormField/geTemplateBuilderFormField.js
@@ -113,7 +113,7 @@ export default class geTemplateBuilderFormField extends LightningElement {
         if (this.field.elementType === WIDGET) {
             return 'slds-size_1-of-12 vertical-align-center'
         } else {
-            return 'slds-size_1-of-12 slds-p-bottom_x-small';
+            return 'slds-size_1-of-12 slds-p-bottom_small';
         }
     }
 
diff --git a/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css b/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css
index 50e416b51da..8d1d02ef01a 100644
--- a/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css
+++ b/force-app/main/default/lwc/geTemplateBuilderFormSection/geTemplateBuilderFormSection.css
@@ -1,12 +1,9 @@
 .slds-card_extension {
-    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
     border: var(--slds-g-radius-border-1, 2px) solid var(--slds-g-color-neutral-base-90, rgb(221, 219, 218));
-    transition: box-shadow 0.3s cubic-bezier(.25,.8,.25,1);
 }
 
 .slds-card_extension:hover {
     cursor: pointer;
-    box-shadow: none var(--slds-g-sizing-border-3, 3px) var(--slds-g-sizing-border-3, 3px) var(--slds-g-color-neutral-base-90, #ddd), none var(--slds-g-sizing-border-3, 3px) var(--slds-g-sizing-border-3, 3px) var(--slds-g-color-neutral-base-90, #ddd);
 }
 
 .slds-card_extension_active {
@@ -21,6 +18,7 @@
     border: var(--slds-g-radius-border-4, 1rem) solid transparent;
     border-right-color: var(--slds-g-color-brand-base-60, #1589ee);
     border-top-color: var(--slds-g-color-brand-base-60, #1589ee);
+    border-top-right-radius: var(--slds-g-radius-border-2, 0.25rem);
 }
 
 .slds-icon_container_extension {
diff --git a/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.html b/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.html
index d1954c61567..d4a2bd1f085 100755
--- a/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.html
+++ b/force-app/main/default/lwc/geTemplateBuilderWidget/geTemplateBuilderWidget.html
@@ -1,6 +1,6 @@
 <template>
     <lightning-layout>
-        <lightning-layout-item size="12" class="slds-p-left_small">
+        <lightning-layout-item size="12" class="slds-p-left_small slds-p-vertical_small">
             <lightning-layout>
                 <template if:true={isAllocations}>
                     <lightning-layout-item size="12">
diff --git a/force-app/main/default/lwc/geTemplates/geTemplates.css b/force-app/main/default/lwc/geTemplates/geTemplates.css
index a20581f99ac..c947969637f 100644
--- a/force-app/main/default/lwc/geTemplates/geTemplates.css
+++ b/force-app/main/default/lwc/geTemplates/geTemplates.css
@@ -1,7 +1,4 @@
 .slds-card_extension {
     background: var(--slds-g-color-disabled-container-1, #fff);
-    border: var(--slds-g-sizing-border-1, 1px) solid var(--slds-g-color-neutral-base-90, #dddbda);
-    border-radius: var(--slds-g-radius-border-2, .25rem);
     background-clip: padding-box;
-    box-shadow: none var(--slds-g-sizing-border-2, 2px) var(--slds-g-sizing-border-2, 2px) none var(--slds-g-color-neutral-base-90, #ddd);
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/utilInput/utilInput.css b/force-app/main/default/lwc/utilInput/utilInput.css
index bd610d2e7f5..9f6cc8f56e1 100644
--- a/force-app/main/default/lwc/utilInput/utilInput.css
+++ b/force-app/main/default/lwc/utilInput/utilInput.css
@@ -1,3 +1,11 @@
 .slds-form-element_hidden label {
     display: none;
+}
+
+.input-padding {
+    padding-bottom: 4px;
+}
+
+.combo-adjust {
+    top: -4px;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/utilInput/utilInput.html b/force-app/main/default/lwc/utilInput/utilInput.html
index 82cd67ad650..f7d5f51f8ab 100755
--- a/force-app/main/default/lwc/utilInput/utilInput.html
+++ b/force-app/main/default/lwc/utilInput/utilInput.html
@@ -9,7 +9,7 @@
     <template if:false={isWidget}>
         <template if:true={isLightningRichText}>
             <lightning-input-rich-text aria-label="default value"
-                                       class="slds-p-horizontal_xx-small"
+                                       class="slds-p-horizontal_xx-small input-padding"
                                        data-id='inputComponent'
                                        data-name="defaultValue"
                                        formats={richTextFormats}
@@ -30,7 +30,7 @@
                                 data-id='inputComponent'
                                 label={uiLabel}
                                 required={isRequired}
-                                class="slds-m-around_none"
+                                class="slds-m-around_none input-padding"
                                 data-name="defaultValue"
                                 onfocusout={handleValueChange}
                                 onclick={stopPropagation}
@@ -49,6 +49,7 @@
                                 options={picklistValues}
                                 data-qa-locator={qaLocatorPicklist}
                                 required={isRequired}
+                                class="combo-adjust"
                                 variant={variant}>
             </lightning-combobox>
         </template>
@@ -59,7 +60,7 @@
                              label={uiLabel}
                              required={isRequired}
                              checked={fieldValue}
-                             class="slds-m-top_small"
+                             class="slds-m-top_small input-padding"
                              data-name="defaultValue"
                              onchange={handleValueChange}
                              onclick={stopPropagation}
@@ -82,7 +83,7 @@
                                                onchange={handleValueChange}
                                                required={isRequired}
                                                variant='label-hidden'
-                                               class="help-text-hidden"
+                                               class="help-text-hidden input-padding"
                                                value={fieldValue}
                                                data-qa-locator={qaLocatorLookup}>
                         </lightning-input-field>
@@ -96,7 +97,7 @@
                              data-id='inputComponent'
                              label={uiLabel}
                              required={isRequired}
-                             class="slds-m-around_none"
+                             class="slds-m-around_none input-padding"
                              data-name="defaultValue"
                              onchange={handleValueChange}
                              onclick={stopPropagation}
@@ -113,7 +114,7 @@
                              data-id='inputComponent'
                              label={uiLabel}
                              required={isRequired}
-                             class="slds-m-around_none"
+                             class="slds-m-around_none input-padding"
                              data-name="defaultValue"
                              onfocusout={handleValueChange}
                              onclick={stopPropagation}
diff --git a/force-app/main/default/lwc/utilInput/utilInput.js b/force-app/main/default/lwc/utilInput/utilInput.js
index ba03e8fc906..177cc21ba4e 100755
--- a/force-app/main/default/lwc/utilInput/utilInput.js
+++ b/force-app/main/default/lwc/utilInput/utilInput.js
@@ -195,7 +195,7 @@ export default class utilInput extends LightningElement {
         } else if (this.variant === LABEL_STACKED) {
             return 'slds-form-element slds-form-element_stacked';
         } else if (this.variant === LABEL_HIDDEN) {
-            return 'slds-form-element slds-form-element_hidden';
+            return 'slds-form-element slds-form-element_hidden combo-adjust';
         }
     }