From 0f937fff190bdaaf688d1173299eed0d019ee8c8 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 09:47:43 +0300
Subject: [PATCH 01/11] AMP-31088: Merge similar transactions inot one funding
 item

---
 .../dataimporter/util/ImporterUtil.java       | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/amp/src/main/java/org/digijava/module/aim/action/dataimporter/util/ImporterUtil.java b/amp/src/main/java/org/digijava/module/aim/action/dataimporter/util/ImporterUtil.java
index 60443eb52c8..eb94da83db3 100644
--- a/amp/src/main/java/org/digijava/module/aim/action/dataimporter/util/ImporterUtil.java
+++ b/amp/src/main/java/org/digijava/module/aim/action/dataimporter/util/ImporterUtil.java
@@ -9,8 +9,6 @@
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
-import org.dgfoundation.amp.ar.ArConstants;
-import org.dgfoundation.amp.ar.ColumnConstants;
 import org.dgfoundation.amp.ar.ARUtil;
 import org.digijava.kernel.ampapi.endpoints.activity.ActivityImportRules;
 import org.digijava.kernel.ampapi.endpoints.activity.ActivityInterchangeUtils;
@@ -26,7 +24,6 @@
 import org.digijava.module.aim.dbentity.*;
 import org.digijava.module.aim.util.CurrencyUtil;
 import org.digijava.module.aim.util.DbUtil;
-import org.digijava.module.aim.util.FeaturesUtil;
 import org.digijava.module.aim.util.ProgramUtil;
 import org.digijava.module.aim.util.SectorUtil;
 import org.digijava.module.aim.util.TeamUtil;
@@ -651,6 +648,32 @@ private static boolean transactionExists(List<Transaction> transactions, Transac
         );
     }
 
+    private static Set<Funding> mergeFundingsByDonor(Set<Funding> fundings) {
+        if (fundings == null || fundings.size() <= 1) return fundings;
+        Map<String, Funding> merged = new LinkedHashMap<>();
+        for (Funding f : fundings) {
+            String key = f.getDonor_organization_id() + "|"
+                    + f.getSource_role() + "|"
+                    + f.getType_of_assistance() + "|"
+                    + f.getFinancing_instrument();
+            Funding existing = merged.get(key);
+            if (existing == null) {
+                merged.put(key, f);
+            } else {
+                for (Transaction t : f.getCommitments()) {
+                    if (!transactionExists(existing.getCommitments(), t)) existing.getCommitments().add(t);
+                }
+                for (Transaction t : f.getDisbursements()) {
+                    if (!transactionExists(existing.getDisbursements(), t)) existing.getDisbursements().add(t);
+                }
+                for (Transaction t : f.getExpenditures()) {
+                    if (!transactionExists(existing.getExpenditures(), t)) existing.getExpenditures().add(t);
+                }
+            }
+        }
+        return new LinkedHashSet<>(merged.values());
+    }
+
     /**
      * Creates a corresponding disbursement transaction for each commitment transaction.
      * The disbursement will have the same amount, currency, and date as the commitment.
@@ -965,6 +988,7 @@ public static Long importTheData(ImportDataModel importDataModel, Session sessio
         objectMapper.configure(ESCAPE_NON_ASCII, false); // Disable escaping of non-ASCII characters during serialization
         objectMapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
 
+        importDataModel.setFundings(mergeFundingsByDonor(importDataModel.getFundings()));
         pruneParentLocationsWhenChildPresent(importDataModel, session);
         normalizeLocationPercentages(importDataModel);
         Map<String, Object> map = objectMapper

From 7cd358fbd5b06e722225be2b00909b247ea83a3b Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 10:58:37 +0300
Subject: [PATCH 02/11] AMP-31088: Merge similar transactions inot one funding
 item

---
 .../module/aim/action/dataimporter/util/ImporterUtil.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/amp/src/main/java/org/digijava/module/aim/action/dataimporter/util/ImporterUtil.java b/amp/src/main/java/org/digijava/module/aim/action/dataimporter/util/ImporterUtil.java
index eb94da83db3..60ef8bd186c 100644
--- a/amp/src/main/java/org/digijava/module/aim/action/dataimporter/util/ImporterUtil.java
+++ b/amp/src/main/java/org/digijava/module/aim/action/dataimporter/util/ImporterUtil.java
@@ -335,7 +335,7 @@ private static String getFundingDate(String dateString) {
         }
         if (dateString != null && dateString.trim().matches("\\d{4}")) {
             int year = Integer.parseInt(dateString.trim());
-            return LocalDate.of(year, 12, 31).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            return LocalDate.of(year, 1, 1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         }
         LocalDate date = LocalDate.now();
         if (isCommonDateFormat(dateString)) {

From 53305038b56e62ae47de3a57ed2e8fb5b2f0845c Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 13:37:29 +0300
Subject: [PATCH 03/11] Change importer styles

---
 .../WEB-INF/jsp/aim/view/dataImporter.jsp     | 29 +++++++++---------
 .../jsp/aim/view/viewImportProgress.jsp       | 30 ++++++++++---------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
index 16ade5b9122..c5fe5454238 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
@@ -6,6 +6,7 @@
 <html:html>
 <head>
   <title><digi:trn>Data Importer</digi:trn></title>
+  <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap" rel="stylesheet">
   <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.1.0/css/select2.min.css" rel="stylesheet" />
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
 
@@ -646,15 +647,15 @@
   </script>
   <style>
     :root {
-      --page-bg: #f4f5f7;
+      --page-bg: #f5faff;
       --panel-bg: #ffffff;
-      --panel-border: #d7dde3;
+      --panel-border: #c8daea;
       --text-strong: #22313a;
-      --text-soft: #667784;
-      --accent: #40606f;
-      --accent-deep: #314b57;
-      --accent-warm: #8a6f56;
-      --surface-muted: #f0f2f4;
+      --text-soft: #4a6880;
+      --accent: #21587b;
+      --accent-deep: #164060;
+      --accent-warm: #2480c6;
+      --surface-muted: #e7f1fd;
       --row-alt: #f8f9fa;
       --shadow: 0 4px 12px rgba(25, 39, 52, 0.05);
       --radius-lg: 14px;
@@ -668,7 +669,7 @@
 
     body {
       margin: 0;
-      font-family: Arial, Helvetica, sans-serif;
+      font-family: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
       font-size: 12px;
       line-height: 1.4;
       color: var(--text-strong);
@@ -779,7 +780,7 @@
 
     input[type="button"],
     button {
-      border: 1px solid #506673;
+      border: 1px solid #21587b;
       border-radius: 999px;
       padding: 8px 14px;
       font-weight: 700;
@@ -851,8 +852,8 @@
     }
 
     table th {
-      background: #eef1f3;
-      color: var(--text-strong);
+      background: #d6e7fd;
+      color: #21587b;
       font-size: 11px;
       letter-spacing: 0.08em;
       text-transform: uppercase;
@@ -889,9 +890,9 @@
       margin-top: 12px;
       padding: 10px 12px;
       border-radius: var(--radius-md);
-      background: #f3efe9;
-      color: #6a5a48;
-      border: 1px solid #dfd6cb;
+      background: #e7f1fd;
+      color: #21587b;
+      border: 1px solid #a3c4e4;
     }
 
     .select2-container--default .select2-selection--single {
diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
index bf33a88b7f7..b21f9376e18 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
@@ -6,18 +6,19 @@
 <html:html>
     <head>
         <title><digi:trn>Imported Files</digi:trn></title>
+        <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap" rel="stylesheet">
         <style>
             :root {
-                --page-bg: #f4f5f7;
+                --page-bg: #f5faff;
                 --panel-bg: #ffffff;
-                --panel-border: #d7dde3;
+                --panel-border: #c8daea;
                 --text-strong: #22313a;
-                --text-soft: #667784;
-                --accent: #40606f;
-                --accent-deep: #314b57;
-                --success: #4a6b58;
-                --danger: #7a5555;
-                --warning: #7d6a53;
+                --text-soft: #4a6880;
+                --accent: #21587b;
+                --accent-deep: #164060;
+                --success: #21C11C;
+                --danger: #c20000;
+                --warning: #f2711c;
                 --row-alt: #f8f9fa;
                 --shadow: 0 4px 12px rgba(25, 39, 52, 0.05);
             }
@@ -28,7 +29,7 @@
 
             body {
                 margin: 0;
-                font-family: Arial, Helvetica, sans-serif;
+                font-family: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
                 font-size: 12px;
                 line-height: 1.4;
                 color: var(--text-strong);
@@ -111,7 +112,8 @@
             }
 
             th {
-                background: #eef1f3;
+                background: #d6e7fd;
+                color: #21587b;
                 font-size: 11px;
                 letter-spacing: 0.08em;
                 text-transform: uppercase;
@@ -128,7 +130,7 @@
             .view-progress-btn,
             .view-more-btn,
             .nav-action-btn {
-                border: 1px solid #506673;
+                border: 1px solid #21587b;
                 border-radius: 999px;
                 padding: 8px 14px;
                 font-size: 12px;
@@ -162,7 +164,7 @@
                 padding: 10px 12px;
                 border-radius: 10px;
                 font-weight: 700;
-                background: #f1f3f5;
+                background: #e7f1fd;
                 border: 1px solid var(--panel-border);
                 font-size: 12px;
             }
@@ -191,7 +193,7 @@
                 margin-bottom: 12px;
                 padding: 10px 12px;
                 border-radius: 10px;
-                background: #f1f3f5;
+                background: #e7f1fd;
                 border: 1px solid var(--panel-border);
             }
 
@@ -225,7 +227,7 @@
                 margin: 10px 0 12px;
                 padding: 10px 12px;
                 border-radius: 10px;
-                background: #f1f3f5;
+                background: #e7f1fd;
                 border: 1px solid var(--panel-border);
             }
 

From e1a67708ce7a428a61856311d4ac7099358c831d Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 13:47:00 +0300
Subject: [PATCH 04/11] AMP-31090: Resolving Errors in the AF with
 disaggregated indicators.

---
 .../endpoints/indicator/manager/IndicatorManagerService.java    | 2 +-
 .../kernel/ampapi/endpoints/settings/SettingsConstants.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/indicator/manager/IndicatorManagerService.java b/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/indicator/manager/IndicatorManagerService.java
index bad04679b80..e67ae5f76df 100644
--- a/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/indicator/manager/IndicatorManagerService.java
+++ b/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/indicator/manager/IndicatorManagerService.java
@@ -46,7 +46,7 @@ public class IndicatorManagerService {
 
     private final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
 
-    public static final String FILTER_BY_PROGRAM = "Filter By Program";
+    public static final String FILTER_BY_PROGRAM = "Filter by Program";
 
     public static final String FILTER_BY_SECTOR = "Filter By Sector";
 
diff --git a/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java b/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java
index 6264e3ea473..cc460beb867 100644
--- a/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java
+++ b/amp/src/main/java/org/digijava/kernel/ampapi/endpoints/settings/SettingsConstants.java
@@ -109,7 +109,7 @@ public class SettingsConstants {
         put(YEAR_ALL, "All");
         put(PROGRAM_SETTINGS, "Program Settings");
         put(INDICATOR_FILTER_BY_SECTOR, "Filter By Sector");
-        put(INDICATOR_FILTER_BY_PROGRAM, "Filter By Program");
+        put(INDICATOR_FILTER_BY_PROGRAM, "Filter by Program");
         put(NUMBER_OF_INDICATORS_IN_DASHBOARD, "Number of indicators in M&E Dashboard");
         put(SORT_COLUMN, GlobalSettingsConstants.DEFAULT_RESOURCES_SORT_COLUMN);
         put(MAXIMUM_FILE_SIZE, GlobalSettingsConstants.CR_MAX_FILE_SIZE );

From 3576f87851ab960f4a453f8f9ff73ef018374d53 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 14:05:01 +0300
Subject: [PATCH 05/11] Change importer styles

---
 .../WEB-INF/jsp/aim/view/dataImporter.jsp     | 73 ++++++++++++++++++-
 .../jsp/aim/view/viewImportProgress.jsp       | 71 ++++++++++++++----
 2 files changed, 127 insertions(+), 17 deletions(-)

diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
index c5fe5454238..d0b3052c483 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
@@ -167,6 +167,13 @@
       toggleUploadSection();
     }
 
+    function switchImporterTab(tabId) {
+      $('.tab-pane').hide();
+      $('.tab-item').removeClass('active');
+      $('#' + tabId).show();
+      $('[data-tab="' + tabId + '"]').addClass('active');
+    }
+
     function revealConfigWorkspace() {
       document.getElementById('otherComponents').removeAttribute('hidden');
       $('#add-field').show();
@@ -174,6 +181,8 @@
       $('#selected-field').show();
       initializeSelectControls();
       toggleUploadSection();
+      $('#tab-mapping-btn').removeClass('disabled-tab');
+      switchImporterTab('tab-mapping-pane');
     }
     
     function replaceLastOccurrence(inputString, search, replacement) {
@@ -780,13 +789,13 @@
 
     input[type="button"],
     button {
-      border: 1px solid #21587b;
+      border: 1px solid #2480c6;
       border-radius: 999px;
       padding: 8px 14px;
       font-weight: 700;
       cursor: pointer;
       color: #fff;
-      background: var(--accent);
+      background: #2480c6;
       font-size: 12px;
       box-shadow: none;
       transition: background-color 0.18s ease, border-color 0.18s ease, color 0.18s ease;
@@ -794,8 +803,8 @@
 
     input[type="button"]:hover,
     button:hover {
-      background: var(--accent-deep);
-      border-color: var(--accent-deep);
+      background: #164060;
+      border-color: #164060;
     }
 
     .remove-row {
@@ -923,6 +932,53 @@
       padding: 6px 8px;
     }
 
+    .tabs-nav {
+      display: flex;
+      gap: 4px;
+      border-bottom: 2px solid #2480c6;
+      margin-bottom: 0;
+    }
+
+    .tab-item {
+      padding: 10px 22px;
+      background: #e7f1fd;
+      color: #0b3e6f;
+      font-weight: 700;
+      cursor: pointer;
+      border: 1px solid #c8daea;
+      border-bottom: none;
+      border-radius: 6px 6px 0 0;
+      font-size: 13px;
+      user-select: none;
+      transition: background 0.15s ease;
+    }
+
+    .tab-item.active {
+      background: #2480c6;
+      color: #fff;
+      border-color: #2480c6;
+    }
+
+    .tab-item:hover:not(.active):not(.disabled-tab) {
+      background: #c5d8f0;
+    }
+
+    .tab-item.disabled-tab {
+      opacity: 0.45;
+      cursor: not-allowed;
+      pointer-events: none;
+    }
+
+    .tab-pane {
+      border: 1px solid #c8daea;
+      border-top: none;
+      border-radius: 0 0 14px 14px;
+      background: var(--panel-bg);
+      padding: 16px;
+      margin-bottom: 14px;
+      box-shadow: var(--shadow);
+    }
+
     @media (max-width: 768px) {
       .importer-page {
         padding: 24px 14px 40px;
@@ -950,6 +1006,12 @@
     <p><digi:trn>Prepare a template, map source columns to AMP entity fields, and upload your data only after the configuration table is ready.</digi:trn></p>
   </div>
 
+  <div class="tabs-nav">
+    <div class="tab-item active" data-tab="tab-configure-pane" id="tab-configure-btn" onclick="switchImporterTab('tab-configure-pane')"><digi:trn>1. File Setup</digi:trn></div>
+    <div class="tab-item disabled-tab" data-tab="tab-mapping-pane" id="tab-mapping-btn" onclick="switchImporterTab('tab-mapping-pane')"><digi:trn>2. Map &amp; Upload</digi:trn></div>
+  </div>
+
+  <div id="tab-configure-pane" class="tab-pane">
   <div class="panel-grid">
     <div class="panel-card">
       <span class="section-label"><digi:trn>Step 1</digi:trn></span>
@@ -1004,7 +1066,9 @@
       </form>
     </div>
   </div>
+  </div>
 
+  <div id="tab-mapping-pane" class="tab-pane" style="display:none">
   <div id="otherComponents" class="workspace-card" hidden>
     <html:form action="${pageContext.request.contextPath}/aim/dataImporter.do" method="post" enctype="multipart/form-data">
       <input type="hidden" id="current-config-name" value="">
@@ -1136,6 +1200,7 @@
       </div>
     </html:form>
   </div>
+  </div>
 </div>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
index b21f9376e18..742b129d10c 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
@@ -130,14 +130,14 @@
             .view-progress-btn,
             .view-more-btn,
             .nav-action-btn {
-                border: 1px solid #21587b;
+                border: 1px solid #2480c6;
                 border-radius: 999px;
                 padding: 8px 14px;
                 font-size: 12px;
                 font-weight: 700;
                 cursor: pointer;
                 color: #fff;
-                background: var(--accent);
+                background: #2480c6;
                 box-shadow: none;
             }
 
@@ -259,6 +259,47 @@
                 color: var(--text-soft);
             }
 
+            .tabs-nav {
+                display: flex;
+                gap: 4px;
+                border-bottom: 2px solid #2480c6;
+                margin-bottom: 0;
+            }
+
+            .tab-item {
+                padding: 10px 22px;
+                background: #e7f1fd;
+                color: #0b3e6f;
+                font-weight: 700;
+                cursor: pointer;
+                border: 1px solid #c8daea;
+                border-bottom: none;
+                border-radius: 6px 6px 0 0;
+                font-size: 13px;
+                user-select: none;
+                transition: background 0.15s ease;
+            }
+
+            .tab-item.active {
+                background: #2480c6;
+                color: #fff;
+                border-color: #2480c6;
+            }
+
+            .tab-item:hover:not(.active) {
+                background: #c5d8f0;
+            }
+
+            .tab-pane {
+                border: 1px solid #c8daea;
+                border-top: none;
+                border-radius: 0 0 14px 14px;
+                background: var(--panel-bg);
+                padding: 16px;
+                margin-bottom: 14px;
+                box-shadow: var(--shadow);
+            }
+
             @media (max-width: 768px) {
                 .progress-page {
                     padding: 24px 14px 40px;
@@ -298,6 +339,13 @@
                 }
             };
 
+            function switchProgressTab(tabId) {
+                $('.tab-pane').hide();
+                $('.tab-item').removeClass('active');
+                $('#' + tabId).show();
+                $('[data-tab="' + tabId + '"]').addClass('active');
+            }
+
             $(document).ready(function() {
 
                 var datatable = $('#import-projects-table').DataTable({
@@ -397,10 +445,7 @@
                             });
                             datatable.draw();
 
-                            var recordsSection = document.getElementById('records-section');
-                            if (recordsSection) {
-                                recordsSection.scrollIntoView({ behavior: 'smooth', block: 'start' });
-                            }
+                            switchProgressTab('tab-records-pane');
 
                         },
                         error: function(xhr, status, error) {
@@ -461,9 +506,12 @@
             </div>
         </div>
 
-        <div class="panel-card">
-            <span class="section-label"><digi:trn>Imported Files</digi:trn></span>
-            <h2><digi:trn>Recent Uploads</digi:trn></h2>
+        <div class="tabs-nav">
+            <div class="tab-item active" data-tab="tab-uploads-pane" onclick="switchProgressTab('tab-uploads-pane')"><digi:trn>Recent Uploads</digi:trn></div>
+            <div class="tab-item" data-tab="tab-records-pane" onclick="switchProgressTab('tab-records-pane')"><digi:trn>Record Details</digi:trn></div>
+        </div>
+
+        <div id="tab-uploads-pane" class="tab-pane">
             <p class="section-copy"><digi:trn>Click a file to load its records and jump directly to the detailed results table.</digi:trn></p>
 
             <div class="uploads-filter-bar">
@@ -509,10 +557,7 @@
             </table>
         </div>
 
-        <div class="records-card file-projects" id="records-section">
-            <span class="section-label"><digi:trn>Record Details</digi:trn></span>
-            <h2><digi:trn>Imported Records</digi:trn></h2>
-
+        <div id="tab-records-pane" class="tab-pane" style="display:none">
             <div class="filter-div">
                 <label for="all-projects"><digi:trn>All</digi:trn>:</label>
                 <input type="radio" id="all-projects" name="project-filter" value="ALL" checked>

From 983199ab8bfb5a327ab8ea0fdb3538471e2d2e26 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 14:22:32 +0300
Subject: [PATCH 06/11] Change importer styles

---
 .../WEB-INF/jsp/aim/view/dataImporter.jsp      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
index d0b3052c483..ff1049c624c 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
@@ -109,9 +109,12 @@
 
     function toggleUploadSection() {
       var hasMappings = $('#selected-pairs-table-body tr').length > 0;
-      $('#data-upload-section').toggle(hasMappings);
       $('#config-empty-note').toggle(!hasMappings);
-      toggleDefaultLocationFallback();
+      if (hasMappings) {
+        $('#tab-upload-btn').removeClass('disabled-tab');
+      } else {
+        $('#tab-upload-btn').addClass('disabled-tab');
+      }
     }
 
     function hasMappedProjectLocationField() {
@@ -1008,7 +1011,8 @@
 
   <div class="tabs-nav">
     <div class="tab-item active" data-tab="tab-configure-pane" id="tab-configure-btn" onclick="switchImporterTab('tab-configure-pane')"><digi:trn>1. File Setup</digi:trn></div>
-    <div class="tab-item disabled-tab" data-tab="tab-mapping-pane" id="tab-mapping-btn" onclick="switchImporterTab('tab-mapping-pane')"><digi:trn>2. Map &amp; Upload</digi:trn></div>
+    <div class="tab-item disabled-tab" data-tab="tab-mapping-pane" id="tab-mapping-btn" onclick="switchImporterTab('tab-mapping-pane')"><digi:trn>2. Map</digi:trn></div>
+    <div class="tab-item disabled-tab" data-tab="tab-upload-pane" id="tab-upload-btn" onclick="switchImporterTab('tab-upload-pane')"><digi:trn>3. Upload</digi:trn></div>
   </div>
 
   <div id="tab-configure-pane" class="tab-pane">
@@ -1116,8 +1120,12 @@
       <div id="config-empty-note" class="helper-note">
         <digi:trn>Add at least one column-to-field pair to unlock data file upload.</digi:trn>
       </div>
+    </html:form>
+  </div>
+  </div>
 
-      <div id="data-upload-section" class="upload-stage" style="display: none;">
+  <div id="tab-upload-pane" class="tab-pane" style="display:none">
+  <div id="data-upload-section" class="upload-stage">
         <span class="section-label"><digi:trn>Step 4</digi:trn></span>
         <h3><digi:trn>Upload Data File</digi:trn></h3>
         <p class="section-copy"><digi:trn>This section appears only when the configuration table contains mappings.</digi:trn></p>
@@ -1198,8 +1206,6 @@
           <input type="button" value="<digi:trn>Upload</digi:trn>" onclick="uploadDataFile()">
         </div>
       </div>
-    </html:form>
-  </div>
   </div>
 </div>
 

From 2fbb4f82b9cae9d4bdf40e3e4e81a8bd44cc7091 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 14:57:29 +0300
Subject: [PATCH 07/11] Change importer styles

---
 .../WEB-INF/jsp/aim/view/dataImporter.jsp     | 32 +++++++++++++++++++
 .../jsp/aim/view/viewImportProgress.jsp       | 25 +++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
index ff1049c624c..ccff6ad84bd 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
@@ -112,8 +112,10 @@
       $('#config-empty-note').toggle(!hasMappings);
       if (hasMappings) {
         $('#tab-upload-btn').removeClass('disabled-tab');
+        $('#next-to-upload-btn').prop('disabled', false);
       } else {
         $('#tab-upload-btn').addClass('disabled-tab');
+        $('#next-to-upload-btn').prop('disabled', true);
       }
     }
 
@@ -185,6 +187,7 @@
       initializeSelectControls();
       toggleUploadSection();
       $('#tab-mapping-btn').removeClass('disabled-tab');
+      $('#next-to-map-btn').prop('disabled', false);
       switchImporterTab('tab-mapping-pane');
     }
     
@@ -982,6 +985,25 @@
       box-shadow: var(--shadow);
     }
 
+    .tab-nav-actions {
+      display: flex;
+      justify-content: flex-end;
+      gap: 10px;
+      margin-top: 20px;
+      padding-top: 14px;
+      border-top: 1px solid #c8daea;
+    }
+
+    .tab-nav-actions .prev-btn {
+      margin-right: auto;
+    }
+
+    button:disabled {
+      opacity: 0.4;
+      cursor: not-allowed;
+      pointer-events: none;
+    }
+
     @media (max-width: 768px) {
       .importer-page {
         padding: 24px 14px 40px;
@@ -1070,6 +1092,9 @@
       </form>
     </div>
   </div>
+  <div class="tab-nav-actions">
+    <button type="button" id="next-to-map-btn" class="next-btn" disabled onclick="switchImporterTab('tab-mapping-pane')"><digi:trn>Next</digi:trn> &#8594;</button>
+  </div>
   </div>
 
   <div id="tab-mapping-pane" class="tab-pane" style="display:none">
@@ -1120,6 +1145,10 @@
       <div id="config-empty-note" class="helper-note">
         <digi:trn>Add at least one column-to-field pair to unlock data file upload.</digi:trn>
       </div>
+      <div class="tab-nav-actions">
+        <button type="button" class="prev-btn" onclick="switchImporterTab('tab-configure-pane')">&#8592; <digi:trn>Previous</digi:trn></button>
+        <button type="button" id="next-to-upload-btn" class="next-btn" disabled onclick="switchImporterTab('tab-upload-pane')"><digi:trn>Next</digi:trn> &#8594;</button>
+      </div>
     </html:form>
   </div>
   </div>
@@ -1205,6 +1234,9 @@
         <div class="mapping-actions">
           <input type="button" value="<digi:trn>Upload</digi:trn>" onclick="uploadDataFile()">
         </div>
+        <div class="tab-nav-actions">
+          <button type="button" class="prev-btn" onclick="switchImporterTab('tab-mapping-pane')">&#8592; <digi:trn>Previous</digi:trn></button>
+        </div>
       </div>
   </div>
 </div>
diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
index 742b129d10c..d053dd08102 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
@@ -300,6 +300,25 @@
                 box-shadow: var(--shadow);
             }
 
+            .tab-nav-actions {
+                display: flex;
+                justify-content: flex-end;
+                gap: 10px;
+                margin-top: 20px;
+                padding-top: 14px;
+                border-top: 1px solid #c8daea;
+            }
+
+            .tab-nav-actions .prev-btn {
+                margin-right: auto;
+            }
+
+            button:disabled {
+                opacity: 0.4;
+                cursor: not-allowed;
+                pointer-events: none;
+            }
+
             @media (max-width: 768px) {
                 .progress-page {
                     padding: 24px 14px 40px;
@@ -555,6 +574,9 @@
                 </c:forEach>
                 </tbody>
             </table>
+            <div class="tab-nav-actions">
+                <button type="button" class="next-btn" onclick="switchProgressTab('tab-records-pane')"><digi:trn>Next</digi:trn> &#8594;</button>
+            </div>
         </div>
 
         <div id="tab-records-pane" class="tab-pane" style="display:none">
@@ -585,6 +607,9 @@
                 </tbody>
             </table>
             <div class="pagination"></div>
+            <div class="tab-nav-actions">
+                <button type="button" class="prev-btn" onclick="switchProgressTab('tab-uploads-pane')">&#8592; <digi:trn>Previous</digi:trn></button>
+            </div>
         </div>
     </div>
 

From 2d0c2e2b89f560b237859aa60bf704ea864f4b9f Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 16:18:08 +0300
Subject: [PATCH 08/11] Change importer styles

---
 .../WEB-INF/jsp/aim/view/dataImporter.jsp     | 59 ++++++++++++-------
 .../jsp/aim/view/viewImportProgress.jsp       | 52 +++++++++++-----
 2 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
index ccff6ad84bd..4b6bcd9bd36 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
@@ -685,7 +685,7 @@
     body {
       margin: 0;
       font-family: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
-      font-size: 12px;
+      font-size: 13px;
       line-height: 1.4;
       color: var(--text-strong);
       background: var(--page-bg);
@@ -720,11 +720,18 @@
       background: var(--panel-bg);
     }
 
-    .hero-card h1,
+    .hero-card h1 {
+      margin: 0 0 8px;
+      font-size: 16px;
+      font-weight: 700;
+      letter-spacing: 0;
+    }
+
+    .panel-card h2,
     .workspace-card h2,
     .upload-stage h3 {
-      margin: 0 0 8px;
-      font-size: 18px;
+      margin: 0 0 6px;
+      font-size: 13px;
       font-weight: 700;
       letter-spacing: 0;
     }
@@ -733,9 +740,9 @@
     .section-copy,
     .helper-note {
       color: var(--text-soft);
-      line-height: 1.45;
+      line-height: 1.55;
       margin: 0;
-      font-size: 12px;
+      font-size: 13px;
     }
 
     .panel-grid {
@@ -760,17 +767,16 @@
       display: inline-block;
       margin-bottom: 6px;
       font-size: 11px;
-      letter-spacing: 0.12em;
-      text-transform: uppercase;
+      letter-spacing: 0.04em;
       color: var(--accent);
-      font-weight: 700;
+      font-weight: 600;
     }
 
     label {
       display: inline-block;
       margin-bottom: 4px;
-      font-size: 12px;
-      font-weight: 700;
+      font-size: 13px;
+      font-weight: 600;
       color: var(--text-strong);
     }
 
@@ -785,7 +791,7 @@
       border: 1px solid rgba(22, 53, 67, 0.18);
       background: #fff;
       color: var(--text-strong);
-      font-size: 12px;
+      font-size: 13px;
     }
 
     input[type="file"] {
@@ -796,13 +802,13 @@
     input[type="button"],
     button {
       border: 1px solid #2480c6;
-      border-radius: 999px;
-      padding: 8px 14px;
-      font-weight: 700;
+      border-radius: 6px;
+      padding: 8px 16px;
+      font-weight: 600;
       cursor: pointer;
       color: #fff;
       background: #2480c6;
-      font-size: 12px;
+      font-size: 13px;
       box-shadow: none;
       transition: background-color 0.18s ease, border-color 0.18s ease, color 0.18s ease;
     }
@@ -996,6 +1002,19 @@
 
     .tab-nav-actions .prev-btn {
       margin-right: auto;
+      background: #20bb45;
+      border-color: #20bb45;
+    }
+
+    .tab-nav-actions .next-btn {
+      background: #20bb45;
+      border-color: #20bb45;
+    }
+
+    .tab-nav-actions .prev-btn:hover,
+    .tab-nav-actions .next-btn:hover {
+      background: #179e39;
+      border-color: #179e39;
     }
 
     button:disabled {
@@ -1093,7 +1112,7 @@
     </div>
   </div>
   <div class="tab-nav-actions">
-    <button type="button" id="next-to-map-btn" class="next-btn" disabled onclick="switchImporterTab('tab-mapping-pane')"><digi:trn>Next</digi:trn> &#8594;</button>
+    <button type="button" id="next-to-map-btn" class="next-btn" disabled onclick="switchImporterTab('tab-mapping-pane')"><digi:trn>Next</digi:trn> &gt;&gt;</button>
   </div>
   </div>
 
@@ -1146,8 +1165,8 @@
         <digi:trn>Add at least one column-to-field pair to unlock data file upload.</digi:trn>
       </div>
       <div class="tab-nav-actions">
-        <button type="button" class="prev-btn" onclick="switchImporterTab('tab-configure-pane')">&#8592; <digi:trn>Previous</digi:trn></button>
-        <button type="button" id="next-to-upload-btn" class="next-btn" disabled onclick="switchImporterTab('tab-upload-pane')"><digi:trn>Next</digi:trn> &#8594;</button>
+        <button type="button" class="prev-btn" onclick="switchImporterTab('tab-configure-pane')">&lt;&lt; <digi:trn>Previous</digi:trn></button>
+        <button type="button" id="next-to-upload-btn" class="next-btn" disabled onclick="switchImporterTab('tab-upload-pane')"><digi:trn>Next</digi:trn> &gt;&gt;</button>
       </div>
     </html:form>
   </div>
@@ -1235,7 +1254,7 @@
           <input type="button" value="<digi:trn>Upload</digi:trn>" onclick="uploadDataFile()">
         </div>
         <div class="tab-nav-actions">
-          <button type="button" class="prev-btn" onclick="switchImporterTab('tab-mapping-pane')">&#8592; <digi:trn>Previous</digi:trn></button>
+          <button type="button" class="prev-btn" onclick="switchImporterTab('tab-mapping-pane')">&lt;&lt; <digi:trn>Previous</digi:trn></button>
         </div>
       </div>
   </div>
diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
index d053dd08102..4161dd4bdbb 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
@@ -30,7 +30,7 @@
             body {
                 margin: 0;
                 font-family: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
-                font-size: 12px;
+                font-size: 13px;
                 line-height: 1.4;
                 color: var(--text-strong);
                 background: var(--page-bg);
@@ -64,28 +64,35 @@
                 background: var(--panel-bg);
             }
 
-            .hero-card h1,
+            .hero-card h1 {
+                margin: 0 0 8px;
+                font-size: 16px;
+                font-weight: 700;
+                letter-spacing: 0;
+            }
+
             .panel-card h2,
             .records-card h2 {
-                margin: 0 0 8px;
-                font-size: 18px;
+                margin: 0 0 6px;
+                font-size: 13px;
+                font-weight: 700;
+                letter-spacing: 0;
             }
 
             .section-label {
                 display: inline-block;
                 margin-bottom: 6px;
                 font-size: 11px;
-                letter-spacing: 0.12em;
-                text-transform: uppercase;
+                letter-spacing: 0.04em;
                 color: var(--accent);
-                font-weight: 700;
+                font-weight: 600;
             }
 
             .section-copy {
                 margin: 0;
                 color: var(--text-soft);
-                line-height: 1.45;
-                font-size: 12px;
+                line-height: 1.55;
+                font-size: 13px;
             }
 
             .panel-card,
@@ -107,7 +114,7 @@
             td, th {
                 text-align: left;
                 padding: 10px 12px;
-                font-size: 12px;
+                font-size: 13px;
                 border-bottom: 1px solid rgba(22, 53, 67, 0.08);
             }
 
@@ -131,10 +138,10 @@
             .view-more-btn,
             .nav-action-btn {
                 border: 1px solid #2480c6;
-                border-radius: 999px;
-                padding: 8px 14px;
-                font-size: 12px;
-                font-weight: 700;
+                border-radius: 6px;
+                padding: 8px 16px;
+                font-size: 13px;
+                font-weight: 600;
                 cursor: pointer;
                 color: #fff;
                 background: #2480c6;
@@ -311,6 +318,19 @@
 
             .tab-nav-actions .prev-btn {
                 margin-right: auto;
+                background: #20bb45;
+                border-color: #20bb45;
+            }
+
+            .tab-nav-actions .next-btn {
+                background: #20bb45;
+                border-color: #20bb45;
+            }
+
+            .tab-nav-actions .prev-btn:hover,
+            .tab-nav-actions .next-btn:hover {
+                background: #179e39;
+                border-color: #179e39;
             }
 
             button:disabled {
@@ -575,7 +595,7 @@
                 </tbody>
             </table>
             <div class="tab-nav-actions">
-                <button type="button" class="next-btn" onclick="switchProgressTab('tab-records-pane')"><digi:trn>Next</digi:trn> &#8594;</button>
+                <button type="button" class="next-btn" onclick="switchProgressTab('tab-records-pane')"><digi:trn>Next</digi:trn> &gt;&gt;</button>
             </div>
         </div>
 
@@ -608,7 +628,7 @@
             </table>
             <div class="pagination"></div>
             <div class="tab-nav-actions">
-                <button type="button" class="prev-btn" onclick="switchProgressTab('tab-uploads-pane')">&#8592; <digi:trn>Previous</digi:trn></button>
+                <button type="button" class="prev-btn" onclick="switchProgressTab('tab-uploads-pane')">&lt;&lt; <digi:trn>Previous</digi:trn></button>
             </div>
         </div>
     </div>

From fc0e12535d36893ee429e55322e514a89e94f91d Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 16:19:15 +0300
Subject: [PATCH 09/11] Change importer styles

---
 amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp       | 2 +-
 amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
index 4b6bcd9bd36..4f1871cbd43 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
@@ -742,7 +742,7 @@
       color: var(--text-soft);
       line-height: 1.55;
       margin: 0;
-      font-size: 13px;
+      font-size: 14px;
     }
 
     .panel-grid {
diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
index 4161dd4bdbb..3d9cbf5b6d3 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
@@ -92,7 +92,7 @@
                 margin: 0;
                 color: var(--text-soft);
                 line-height: 1.55;
-                font-size: 13px;
+                font-size: 14px;
             }
 
             .panel-card,

From 79bf432940aafbf4bcc6dee962071f1726d722d0 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 16:43:29 +0300
Subject: [PATCH 10/11] Change importer styles for better user experience

---
 .../WEB-INF/jsp/aim/view/dataImporter.jsp     |  3 +-
 .../jsp/aim/view/viewImportProgress.jsp       | 28 +++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
index 4f1871cbd43..c5224900fda 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
@@ -725,6 +725,7 @@
       font-size: 16px;
       font-weight: 700;
       letter-spacing: 0;
+      text-transform: none;
     }
 
     .panel-card h2,
@@ -739,7 +740,7 @@
     .hero-card p,
     .section-copy,
     .helper-note {
-      color: var(--text-soft);
+      color: var(--text-strong);
       line-height: 1.55;
       margin: 0;
       font-size: 14px;
diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
index 3d9cbf5b6d3..388e51b8209 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
@@ -69,6 +69,7 @@
                 font-size: 16px;
                 font-weight: 700;
                 letter-spacing: 0;
+                text-transform: none;
             }
 
             .panel-card h2,
@@ -90,7 +91,7 @@
 
             .section-copy {
                 margin: 0;
-                color: var(--text-soft);
+                color: var(--text-strong);
                 line-height: 1.55;
                 font-size: 14px;
             }
@@ -135,23 +136,40 @@
             }
 
             .view-progress-btn,
-            .view-more-btn,
             .nav-action-btn {
-                border: 1px solid #2480c6;
+                border: 1px solid #20bb45;
                 border-radius: 6px;
                 padding: 8px 16px;
                 font-size: 13px;
                 font-weight: 600;
                 cursor: pointer;
                 color: #fff;
-                background: #2480c6;
+                background: #20bb45;
                 box-shadow: none;
             }
 
+            .view-progress-btn:hover,
+            .nav-action-btn:hover {
+                background: #179e39;
+                border-color: #179e39;
+            }
+
             .view-more-btn {
                 margin-top: 6px;
                 padding: 6px 12px;
-                font-size: 11px;
+                font-size: 13px;
+                font-weight: 600;
+                cursor: pointer;
+                border: 1px solid #20bb45;
+                border-radius: 6px;
+                background: transparent;
+                color: #20bb45;
+                box-shadow: none;
+            }
+
+            .view-more-btn:hover {
+                background: #20bb45;
+                color: #fff;
             }
 
             .hero-actions {

From ae5454139f7383d3426129c9ab50a7b14559df44 Mon Sep 17 00:00:00 2001
From: brianbrix <mokandubrian@gmail.com>
Date: Mon, 30 Mar 2026 17:27:51 +0300
Subject: [PATCH 11/11] Change importer styles for better user experience

---
 .../WEB-INF/jsp/aim/view/dataImporter.jsp     | 24 +++++++++++++------
 .../jsp/aim/view/viewImportProgress.jsp       | 10 ++++----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
index c5224900fda..6d9e25003f7 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/dataImporter.jsp
@@ -662,9 +662,9 @@
   </script>
   <style>
     :root {
-      --page-bg: #f5faff;
+      --page-bg: #f9fafb;
       --panel-bg: #ffffff;
-      --panel-border: #c8daea;
+      --panel-border: rgba(34, 36, 38, 0.15);
       --text-strong: #22313a;
       --text-soft: #4a6880;
       --accent: #21587b;
@@ -672,8 +672,8 @@
       --accent-warm: #2480c6;
       --surface-muted: #e7f1fd;
       --row-alt: #f8f9fa;
-      --shadow: 0 4px 12px rgba(25, 39, 52, 0.05);
-      --radius-lg: 14px;
+      --shadow: 0 1px 2px 0 rgba(34, 36, 38, 0.15);
+      --radius-lg: 6px;
       --radius-md: 10px;
       --radius-sm: 6px;
     }
@@ -714,7 +714,7 @@
     }
 
     .hero-card {
-      border-radius: 16px;
+      border-radius: 6px;
       padding: 20px;
       margin-bottom: 14px;
       background: var(--panel-bg);
@@ -820,6 +820,16 @@
       border-color: #164060;
     }
 
+    .upload-btn {
+      background: #f2711c;
+      border-color: #f2711c;
+    }
+
+    .upload-btn:hover {
+      background: #d45800 !important;
+      border-color: #d45800 !important;
+    }
+
     .remove-row {
       background: #6f5a5a;
       border-color: #6f5a5a;
@@ -1107,7 +1117,7 @@
         <label for="template-file"><digi:trn>Select Template File</digi:trn></label>
         <input id="template-file" type="file" accept=".xls,.xlsx,.csv" name="templateFile" />
         <div class="mapping-actions">
-          <input type="button" value="<digi:trn>Upload Template</digi:trn>" onclick="uploadTemplateFile()" />
+          <input type="button" class="upload-btn" value="<digi:trn>Upload Template</digi:trn>" onclick="uploadTemplateFile()" />
         </div>
       </form>
     </div>
@@ -1252,7 +1262,7 @@
         </div>
 
         <div class="mapping-actions">
-          <input type="button" value="<digi:trn>Upload</digi:trn>" onclick="uploadDataFile()">
+          <input type="button" class="upload-btn" value="<digi:trn>Upload</digi:trn>" onclick="uploadDataFile()">
         </div>
         <div class="tab-nav-actions">
           <button type="button" class="prev-btn" onclick="switchImporterTab('tab-mapping-pane')">&lt;&lt; <digi:trn>Previous</digi:trn></button>
diff --git a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
index 388e51b8209..b6820395619 100644
--- a/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
+++ b/amp/src/main/webapp/WEB-INF/jsp/aim/view/viewImportProgress.jsp
@@ -9,9 +9,9 @@
         <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@400;600;700&display=swap" rel="stylesheet">
         <style>
             :root {
-                --page-bg: #f5faff;
+                --page-bg: #f9fafb;
                 --panel-bg: #ffffff;
-                --panel-border: #c8daea;
+                --panel-border: rgba(34, 36, 38, 0.15);
                 --text-strong: #22313a;
                 --text-soft: #4a6880;
                 --accent: #21587b;
@@ -20,7 +20,7 @@
                 --danger: #c20000;
                 --warning: #f2711c;
                 --row-alt: #f8f9fa;
-                --shadow: 0 4px 12px rgba(25, 39, 52, 0.05);
+                --shadow: 0 1px 2px 0 rgba(34, 36, 38, 0.15);
             }
 
             html {
@@ -55,7 +55,7 @@
                 background: var(--panel-bg);
                 border: 1px solid var(--panel-border);
                 box-shadow: var(--shadow);
-                border-radius: 14px;
+                border-radius: 6px;
             }
 
             .hero-card {
@@ -108,7 +108,7 @@
                 border-spacing: 0;
                 background: #fff;
                 border: 1px solid rgba(22, 53, 67, 0.1);
-                border-radius: 18px;
+                border-radius: 6px;
                 overflow: hidden;
             }