diff --git a/ipi-survey-platform/src/assets/images/CaretDown.svg b/ipi-survey-platform/src/assets/images/CaretDown.svg
index 7163c83..58ed51c 100644
--- a/ipi-survey-platform/src/assets/images/CaretDown.svg
+++ b/ipi-survey-platform/src/assets/images/CaretDown.svg
@@ -1,3 +1,3 @@
 <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.6922 7.94254L10.4422 14.1925C10.3842 14.2506 10.3152 14.2967 10.2393 14.3282C10.1635 14.3597 10.0821 14.3758 10 14.3758C9.91788 14.3758 9.83655 14.3597 9.76067 14.3282C9.6848 14.2967 9.61587 14.2506 9.55782 14.1925L3.30782 7.94254C3.19055 7.82526 3.12466 7.6662 3.12466 7.50035C3.12466 7.3345 3.19055 7.17544 3.30782 7.05816C3.4251 6.94088 3.58416 6.875 3.75001 6.875C3.91586 6.875 4.07492 6.94088 4.1922 7.05816L10 12.8668L15.8078 7.05816C15.8659 7.00009 15.9348 6.95403 16.0107 6.9226C16.0866 6.89117 16.1679 6.875 16.25 6.875C16.3321 6.875 16.4135 6.89117 16.4893 6.9226C16.5652 6.95403 16.6341 7.00009 16.6922 7.05816C16.7503 7.11623 16.7963 7.18517 16.8278 7.26104C16.8592 7.33691 16.8754 7.41823 16.8754 7.50035C16.8754 7.58247 16.8592 7.66379 16.8278 7.73966C16.7963 7.81553 16.7503 7.88447 16.6922 7.94254Z" fill="#92722A"/>
+<path d="M16.6925 7.94229L10.4425 14.1923C10.3845 14.2504 10.3156 14.2965 10.2397 14.328C10.1638 14.3594 10.0825 14.3756 10.0003 14.3756C9.91821 14.3756 9.83688 14.3594 9.76101 14.328C9.68514 14.2965 9.61621 14.2504 9.55816 14.1923L3.30816 7.94229C3.19088 7.82502 3.125 7.66596 3.125 7.5001C3.125 7.33425 3.19088 7.17519 3.30816 7.05792C3.42544 6.94064 3.5845 6.87476 3.75035 6.87476C3.9162 6.87476 4.07526 6.94064 4.19253 7.05792L10.0003 12.8665L15.8082 7.05792C15.8662 6.99985 15.9352 6.95378 16.011 6.92236C16.0869 6.89093 16.1682 6.87476 16.2503 6.87476C16.3325 6.87476 16.4138 6.89093 16.4897 6.92236C16.5655 6.95378 16.6345 6.99985 16.6925 7.05792C16.7506 7.11598 16.7967 7.18492 16.8281 7.26079C16.8595 7.33666 16.8757 7.41798 16.8757 7.5001C16.8757 7.58223 16.8595 7.66354 16.8281 7.73941C16.7967 7.81528 16.7506 7.88422 16.6925 7.94229Z" fill="#92722A"/>
 </svg>
diff --git a/ipi-survey-platform/src/assets/images/Active - User.svg b/ipi-survey-platform/src/assets/images/active-user.svg
similarity index 100%
rename from ipi-survey-platform/src/assets/images/Active - User.svg
rename to ipi-survey-platform/src/assets/images/active-user.svg
diff --git a/ipi-survey-platform/src/assets/images/CaretDown - active.svg b/ipi-survey-platform/src/assets/images/caretdown-active.svg
similarity index 100%
rename from ipi-survey-platform/src/assets/images/CaretDown - active.svg
rename to ipi-survey-platform/src/assets/images/caretdown-active.svg
diff --git a/ipi-survey-platform/src/assets/images/Inactive - user.svg b/ipi-survey-platform/src/assets/images/inactive-user.svg
similarity index 100%
rename from ipi-survey-platform/src/assets/images/Inactive - user.svg
rename to ipi-survey-platform/src/assets/images/inactive-user.svg
diff --git a/ipi-survey-platform/src/assets/images/PencilSimple - inactive.svg b/ipi-survey-platform/src/assets/images/pencilsimple-inactive.svg
similarity index 100%
rename from ipi-survey-platform/src/assets/images/PencilSimple - inactive.svg
rename to ipi-survey-platform/src/assets/images/pencilsimple-inactive.svg
diff --git a/ipi-survey-platform/src/components/admin/AdminHeader.jsx b/ipi-survey-platform/src/components/admin/AdminHeader.jsx
index bc3c62a..379eddd 100644
--- a/ipi-survey-platform/src/components/admin/AdminHeader.jsx
+++ b/ipi-survey-platform/src/components/admin/AdminHeader.jsx
@@ -1,15 +1,15 @@
 import React from 'react';
 import { NavLink, useNavigate } from 'react-router-dom';
-import Logo from '../../assets/images/FCSCLogo.svg';
+import Logo from '../../assets/images/fcsclogo.svg';
 import DashboardIconActive from '../../assets/images/cuida_dashboard-outline.svg';
 import DashboardIconInactive from '../../assets/images/cuida_dashboard-outline-inactive.svg';
-import CheckCircleActive from '../../assets/images/CheckCircle-active.svg';
+import CheckCircleActive from '../../assets/images/checkcircle-active.svg';
 import ConfigActive from '../../assets/images/configrationicon-active.svg';
 import ConfigInactive from '../../assets/images/configrationicon-inactive.svg';
-import UserActive from '../../assets/images/User-active.svg';
-import UserInactive from '../../assets/images/User-inactive.svg';
+import UserActive from '../../assets/images/user-active.svg';
+import UserInactive from '../../assets/images/user-inactive.svg';
 import ManageSubmissionInactive from '../../assets/images/managesubmission - inactive.svg';
-import BellIconAsset from '../../assets/images/Bell.svg';
+import BellIconAsset from '../../assets/images/bell.svg';
 
 const NavItem = ({ label, to, iconActive, iconInactive, end = false }) => (
   <NavLink
diff --git a/ipi-survey-platform/src/components/common/FormControls.jsx b/ipi-survey-platform/src/components/common/FormControls.jsx
index 20f8b22..72ea545 100644
--- a/ipi-survey-platform/src/components/common/FormControls.jsx
+++ b/ipi-survey-platform/src/components/common/FormControls.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import CaretDownActive from '../../assets/images/CaretDown - active.svg';
+import CaretDownActive from '../../assets/images/caretdown-active.svg';
 import CalendarIcon from '../../assets/images/uil_calender.svg';
 
 const baseInputStyles = {
@@ -89,11 +89,18 @@ export const TextField = ({
     : focused && !readOnly
     ? focusBorderColors[variant]
     : idleBorderColors[variant] || idleBorderColors.default;
+  if (hasError) {
+    inputStyle.backgroundColor = '#FEF2F2';
+    inputStyle.color = '#B91C1C';
+  }
+  if (!hasError && variant !== 'toolbar') {
+    inputStyle.color = '#232528';
+  }
   if (readOnly) {
     inputStyle.backgroundColor = '#F9FAFB';
   }
-  if (variant !== 'toolbar') {
-    inputStyle.color = '#232528';
+  if (!hasError && variant === 'toolbar') {
+    inputStyle.color = '#5F646D';
   }
   return (
     <div style={wrapperStyle} className="w-full">
@@ -196,7 +203,10 @@ export const SelectField = ({
     : focused
     ? focusBorderColors[variant]
     : idleBorderColors[variant] || idleBorderColors.default;
-  if (variant === 'toolbar') {
+  if (hasError) {
+    inputStyle.backgroundColor = '#FEF2F2';
+    inputStyle.color = '#B91C1C';
+  } else if (variant === 'toolbar') {
     inputStyle.color = hasValue && value !== 'All' && value !== 'Status' && value !== 'Year' && value !== 'Quarter' && value !== 'Emirates' ? '#232528' : '#5F646D';
   } else {
     inputStyle.color = hasValue ? '#232528' : '#232528';
@@ -307,7 +317,7 @@ export const PhoneField = ({
     alignItems: 'center',
     border: `2px solid ${borderColor}`,
     borderRadius: '4px',
-    backgroundColor: readOnly ? '#F9FAFB' : '#FFFFFF',
+    backgroundColor: readOnly ? '#F9FAFB' : hasError ? '#FEF2F2' : '#FFFFFF',
     transition: 'border-color 0.2s ease',
     height: '40px',
     paddingRight: '8px',
@@ -319,7 +329,7 @@ export const PhoneField = ({
     paddingLeft: '12px',
     paddingRight: '24px',
     fontSize: '14px',
-    color: '#232528',
+    color: hasError ? '#B91C1C' : '#232528',
     appearance: 'none',
     WebkitAppearance: 'none',
     MozAppearance: 'none',
@@ -332,7 +342,7 @@ export const PhoneField = ({
     outline: 'none',
     background: 'transparent',
     fontSize: '14px',
-    color: '#232528',
+    color: hasError ? '#B91C1C' : '#232528',
     padding: '0 0 0 8px',
   };
   const arrowStyle = {
@@ -436,7 +446,7 @@ export const DateField = ({
     wrapperStyle.width = typeof width === 'number' ? `${width}px` : width;
   }
   const inputStyle = {
-    ...baseInputStyle,
+    ...(baseInputStyles?.default || {}),
     ...style,
     color: value ? '#232528' : '#232528',
     borderColor: focused ? '#92722A' : '#CBA344',
diff --git a/ipi-survey-platform/src/components/common/Loader.jsx b/ipi-survey-platform/src/components/common/Loader.jsx
index 8d1c8b6..61b7ac5 100644
--- a/ipi-survey-platform/src/components/common/Loader.jsx
+++ b/ipi-survey-platform/src/components/common/Loader.jsx
@@ -1 +1,22 @@
+import React from 'react';
+
+const sizeClassMap = {
+  sm: 'h-4 w-4 border-2',
+  md: 'h-6 w-6 border-2',
+  lg: 'h-10 w-10 border-4',
+};
+
+const Loader = ({ size = 'md', label = '', className = '' }) => {
+  const sizeClass = sizeClassMap[size] || sizeClassMap.md;
+  return (
+    <div className={`flex items-center gap-3 ${className}`} role="status" aria-live="polite">
+      <span
+        className={`inline-block ${sizeClass} rounded-full border-solid border-[#92722A] border-t-transparent animate-spin`}
+      />
+      {label ? <span className="text-sm text-[#4B5563]">{label}</span> : null}
+    </div>
+  );
+};
+
+export default Loader;
  
diff --git a/ipi-survey-platform/src/components/common/Table.jsx b/ipi-survey-platform/src/components/common/Table.jsx
index 0b0ea8f..2752f2f 100644
--- a/ipi-survey-platform/src/components/common/Table.jsx
+++ b/ipi-survey-platform/src/components/common/Table.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import CaretLeftIcon from '../../assets/images/CaretLeft.svg';
-import CaretRightIcon from '../../assets/images/CaretRight.svg';
-import CaretDoubleLeftIcon from '../../assets/images/CaretDoubleLeft.svg';
-import CaretDoubleRightIcon from '../../assets/images/CaretDoubleRight.svg';
+import CaretLeftIcon from '../../assets/images/caretleft.svg';
+import CaretRightIcon from '../../assets/images/caretright.svg';
+import CaretDoubleLeftIcon from '../../assets/images/caretdoubleleft.svg';
+import CaretDoubleRightIcon from '../../assets/images/caretdoubleright.svg';
 
 // Generic, reusable table
 // Props:
diff --git a/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx b/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx
index 6f22162..127c0f1 100644
--- a/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx
+++ b/ipi-survey-platform/src/components/dashboard/SubmissionHistory.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { useNavigate } from 'react-router-dom';
 import Table from '../common/Table';
 import SearchIcon from '../../assets/images/material-symbols_search-rounded.svg';
-import CaretDown from '../../assets/images/CaretDown.svg';
+import CaretDown from '../../assets/images/caretdown.svg';
 
 const getStatusClass = (status) => {
   const normalized = String(status || '').toLowerCase();
diff --git a/ipi-survey-platform/src/components/layout/HeaderBar.jsx b/ipi-survey-platform/src/components/layout/HeaderBar.jsx
index 33c0d9b..95bea4e 100644
--- a/ipi-survey-platform/src/components/layout/HeaderBar.jsx
+++ b/ipi-survey-platform/src/components/layout/HeaderBar.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { NavLink, useNavigate } from 'react-router-dom';
-import Logo from '../../assets/images/FCSCLogo.svg';
-import SurveyIconActive from '../../assets/images/Vector.svg';
+import Logo from '../../assets/images/fcsclogo.svg';
+import SurveyIconActive from '../../assets/images/vector.svg';
 import SurveyIconInactive from '../../assets/images/vectorblack.svg';
 import DashboardIconActive from '../../assets/images/cuida_dashboard-outline.svg';
 import DashboardIconInactive from '../../assets/images/cuida_dashboard-outline-inactive.svg';
diff --git a/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx b/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx
index 9362384..cbe0b8d 100644
--- a/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx
+++ b/ipi-survey-platform/src/components/survey/EstablishmentInfo/EstablishmentInfo.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import CaretDown from '../../../assets/images/caretdown.svg';
-import PrimaryButton from '../../../assets/images/primarybutton.svg';
 import BackVendor from '../../../assets/images/backvector.svg';
 
 const Field = ({ label, placeholder = '', type = 'text', value = '', onChange = () => {}, disabled = false }) => (
diff --git a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
index 0aef6a5..250c489 100644
--- a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
+++ b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
@@ -5,7 +5,7 @@ import {
   fetchProducts,
   fetchUnits,
 } from '../../../services/masters/masterService.js';
-import CaretDown from '../../../assets/images/caretdown.svg';
+import CaretDown from '../../../assets/images/caretdown-black.svg';
 
 const Input = ({ placeholder = '', type = 'text', value = '', onChange = () => {} }) => (
   <input
diff --git a/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx b/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx
index a75258a..4714926 100644
--- a/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx
+++ b/ipi-survey-platform/src/components/survey/ReviewSubmit/ReviewSubmit.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import Table from '../../common/Table';
-import BackVendor from '../../../assets/images/backvector.svg';
+import BackVendor from '../../../assets/images/caretdown-black.svg';
 
 const Card = ({ title, children }) => (
   <div className="bg-white w-full rounded-lg shadow-sm ring-1 ring-gray-200">
diff --git a/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx b/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx
index d03bd15..be147cf 100644
--- a/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx
+++ b/ipi-survey-platform/src/pages/Admin/ValidationReview.jsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { Link, useNavigate, useParams } from 'react-router-dom';
 import AdminHeader from '../../components/admin/AdminHeader';
 import CaretUp from '../../assets/images/caret-up.svg';
-import EstablishmentIcon from '../../assets/images/Establishment.svg';
-import EstablishmentIdIcon from '../../assets/images/Establishmentid.svg';
+import EstablishmentIcon from '../../assets/images/establishment.svg';
+import EstablishmentIdIcon from '../../assets/images/establishmentid.svg';
 import EmailIcon from '../../assets/images/emailid.svg';
 import EmiratesIcon from '../../assets/images/emirates.svg';
 import TotalEmployeesIcon from '../../assets/images/totalemployess.svg';
diff --git a/ipi-survey-platform/src/pages/Admin/Validations.jsx b/ipi-survey-platform/src/pages/Admin/Validations.jsx
index 4f4987d..d6bb35d 100644
--- a/ipi-survey-platform/src/pages/Admin/Validations.jsx
+++ b/ipi-survey-platform/src/pages/Admin/Validations.jsx
@@ -3,7 +3,7 @@ import { Link, useNavigate } from 'react-router-dom';
 import AdminHeader from '../../components/admin/AdminHeader';
 import Table from '../../components/common/Table';
 import SearchIcon from '../../assets/images/material-symbols_search-rounded.svg';
-import DownloadIcon from '../../assets/images/DownloadSimple.svg';
+import DownloadIcon from '../../assets/images/downloadsimple.svg';
 import CaretUp from '../../assets/images/caret-up.svg';
 import { SelectField } from '../../components/common/FormControls';
 import { getSubmissions } from '../../services/admin/submission.js';
diff --git a/ipi-survey-platform/src/pages/Admin/configuration/AdminUsers.jsx b/ipi-survey-platform/src/pages/Admin/configuration/AdminUsers.jsx
index 9fbb3f3..d3497a9 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/AdminUsers.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/AdminUsers.jsx
@@ -1,15 +1,15 @@
 import React from 'react';
 import Table from '../../../components/common/Table';
 import SearchIcon from '../../../assets/images/material-symbols_search-rounded.svg';
-import ExportIcon from '../../../assets/images/DownloadSimple.svg';
+import ExportIcon from '../../../assets/images/downloadsimple.svg';
 import AddIcon from '../../../assets/images/ic_baseline-plus.svg';
-import PencilActive from '../../../assets/images/PencilSimple.svg';
-import PencilInactive from '../../../assets/images/PencilSimple - inactive.svg';
-import TrashActive from '../../../assets/images/Trash - active.svg';
-import TrashInactive from '../../../assets/images/Trash - Inactive.svg';
-import AdminUserIcon from '../../../assets/images/UserGear.svg';
-import ActiveUserIcon from '../../../assets/images/Active - User.svg';
-import InactiveUserIcon from '../../../assets/images/Inactive - user.svg';
+import PencilActive from '../../../assets/images/pencilsimple.svg';
+import PencilInactive from '../../../assets/images/pencilsimple-inactive.svg';
+import TrashActive from '../../../assets/images/trash - active.svg';
+import TrashInactive from '../../../assets/images/trash - inactive.svg';
+import AdminUserIcon from '../../../assets/images/usergear.svg';
+import ActiveUserIcon from '../../../assets/images/active-user.svg';
+import InactiveUserIcon from '../../../assets/images/inactive-user.svg';
 import ResetPasswordIcon from '../../../assets/images/hugeicons_reset-password.svg';
 import ResetPasswordInactiveIcon from '../../../assets/images/hugeicons_reset-password-inactive.svg';
 
diff --git a/ipi-survey-platform/src/pages/Admin/configuration/CompanyProfile.jsx b/ipi-survey-platform/src/pages/Admin/configuration/CompanyProfile.jsx
index b5a8429..19451ae 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/CompanyProfile.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/CompanyProfile.jsx
@@ -1,6 +1,8 @@
-  import React from 'react';
+import React from 'react';
 import Table from '../../../components/common/Table';
+import Loader from '../../../components/common/Loader';
 import { TextField, SelectField, PhoneField } from '../../../components/common/FormControls';
+import { fetchEmirates, fetchCityTowns } from '../../../services/masters/masterService';
 import {
   createEstablishment,
   fetchEstablishments,
@@ -9,12 +11,12 @@ import {
   deleteEstablishment,
 } from '../../../services/establishments/establishmentService';
 import SearchIcon from '../../../assets/images/material-symbols_search-rounded.svg';
-import DownloadIcon from '../../../assets/images/DownloadSimple.svg';
+import DownloadIcon from '../../../assets/images/downloadsimple.svg';
 import AddIcon from '../../../assets/images/ic_baseline-plus.svg';
-import PencilActive from '../../../assets/images/PencilSimple.svg';
-import PencilInactive from '../../../assets/images/PencilSimple - inactive.svg';
-import TrashActive from '../../../assets/images/Trash - active.svg';
-import TrashInactive from '../../../assets/images/Trash - Inactive.svg';
+import PencilActive from '../../../assets/images/pencilsimple.svg';
+import PencilInactive from '../../../assets/images/pencilsimple-inactive.svg';
+import TrashActive from '../../../assets/images/trash - active.svg';
+import TrashInactive from '../../../assets/images/trash - inactive.svg';
 import ResetPasswordActive from '../../../assets/images/hugeicons_reset-password.svg';
 import ResetPasswordInactive from '../../../assets/images/hugeicons_reset-password-inactive.svg';
 import DeleteIcon from '../../../assets/images/delete.svg';
@@ -37,27 +39,6 @@ const validatePasswordComplexity = (password) => {
   return '';
 };
 
-const emirateOptions = [
-  { label: 'Abu Dhabi', value: 'Abu Dhabi' },
-  { label: 'Dubai', value: 'Dubai' },
-  { label: 'Sharjah', value: 'Sharjah' },
-  { label: 'Ajman', value: 'Ajman' },
-  { label: 'Umm Al Quwain', value: 'Umm Al Quwain' },
-  { label: 'Ras Al Khaimah', value: 'Ras Al Khaimah' },
-  { label: 'Fujairah', value: 'Fujairah' },
-];
-
-const cityOptions = [
-  { label: 'Abu Dhabi', value: 'Abu Dhabi' },
-  { label: 'Al Ain', value: 'Al Ain' },
-  { label: 'Dubai', value: 'Dubai' },
-  { label: 'Sharjah', value: 'Sharjah' },
-  { label: 'Ajman', value: 'Ajman' },
-  { label: 'Umm Al Quwain', value: 'Umm Al Quwain' },
-  { label: 'Ras Al Khaimah', value: 'Ras Al Khaimah' },
-  { label: 'Fujairah', value: 'Fujairah' },
-];
-
 const countryCodeOptions = [{ label: '+971', value: '+971' }];
 
 const WEBSITE_URL_PATTERN = /^(https?:\/\/)?([\w-]+\.)+[\w-]{2,}(\/[^\s]*)?$/i;
@@ -108,7 +89,9 @@ const createEmptyProfile = () => ({
   contactName: '',
   contactAddress: '',
   contactCityTown: '',
+  contactCityTownId: '',
   contactEmirate: '',
+  contactEmirateId: '',
   contactPostalCode: '',
   contactPoBox: '',
   contactMakaniNumber: '',
@@ -123,7 +106,9 @@ const createEmptyProfile = () => ({
   corporateName: '',
   corporateAddress: '',
   corporateCityTown: '',
+  corporateCityTownId: '',
   corporateEmirate: '',
+  corporateEmirateId: '',
   corporatePostalCode: '',
   corporatePoBox: '',
   corporateMakaniNumber: '',
@@ -140,163 +125,164 @@ const createEmptyProfile = () => ({
   employmentNonEmiratiFemale: '',
   employmentTotalEmployees: '',
   employmentTotalEmirati: '',
+  createdById: '',
 });
 
-const companyProfilesSeed = [
-  {
-    ...createEmptyProfile(),
-    establishmentName: 'CASCADE MARINE FOODS LLC',
-    emirate: 'Sharjah',
-    isicCode: '2098',
-    establishmentId: 'MSCensus-23-04-001276',
-    products: '10',
-    totalEmployees: '300',
-    createdBy: 'Amend (Owner)',
-    createdOn: '18/10/2025',
-    lastUpdated: 'Omar',
-    contactName: 'CASCADE MARINE FOODS LLC',
-    contactEmirate: 'Sharjah',
-    corporateName: 'CASCADE MARINE FOODS LLC',
-  },
-  {
-    ...createEmptyProfile(),
-    establishmentName: 'Khazan Meat Factory',
-    emirate: 'Sharjah',
-    isicCode: '1098',
-    establishmentId: 'MSCensus-23-05-002829',
-    products: '6',
-    totalEmployees: '100',
-    createdBy: 'Sara (Admin)',
-    createdOn: '18/10/2025',
-    lastUpdated: 'Abdul',
-    contactName: 'Khazan Meat Factory',
-    contactEmirate: 'Sharjah',
-    corporateName: 'Khazan Meat Factory',
-  },
-  {
-    ...createEmptyProfile(),
-    establishmentName: 'Spinneys Fresh Food Industries L.L.C',
-    emirate: 'Dubai',
-    isicCode: '3198',
-    establishmentId: 'MSCensus-Dubai-1407',
-    products: '8',
-    totalEmployees: '40',
-    createdBy: 'Shaik (Admin)',
-    createdOn: '18/10/2025',
-    lastUpdated: 'Abdul',
-    contactName: 'Spinneys Fresh Food Industries L.L.C',
-    contactEmirate: 'Dubai',
-    corporateName: 'Spinneys Fresh Food Industries L.L.C',
-  },
-  {
-    ...createEmptyProfile(),
-    establishmentName: 'Freshly Frozen Foods Factory L.L.C',
-    emirate: 'Dubai',
-    isicCode: '2098',
-    establishmentId: 'MSCensus-Dubai-906',
-    products: '4',
-    totalEmployees: '50',
-    createdBy: 'Abdul (Manager)',
-    createdOn: '18/10/2025',
-    lastUpdated: 'Abdul',
-    contactName: 'Freshly Frozen Foods Factory L.L.C',
-    contactEmirate: 'Dubai',
-    corporateName: 'Freshly Frozen Foods Factory L.L.C',
-  },
-  {
-    ...createEmptyProfile(),
-    establishmentName: 'Sahar Food Industry (L.L.C)',
-    emirate: 'Dubai',
-    isicCode: '1095',
-    establishmentId: 'MSCensus-Dubai-472',
-    products: '8',
-    totalEmployees: '80',
-    createdBy: 'Amend (Owner)',
-    createdOn: '18/10/2025',
-    lastUpdated: 'Abdul',
-    contactName: 'Sahar Food Industry (L.L.C)',
-    contactEmirate: 'Dubai',
-    corporateName: 'Sahar Food Industry (L.L.C)',
-  },
-  {
-    ...createEmptyProfile(),
-    establishmentName: 'Continental Food Processing LLC',
-    emirate: 'Ajman',
-    isicCode: '0035',
-    establishmentId: 'MSCensus-23-06-005496',
-    products: '5',
-    totalEmployees: '400',
-    createdBy: 'Sara (Admin)',
-    createdOn: '18/10/2025',
-    lastUpdated: 'Abdul',
-    contactName: 'Continental Food Processing LLC',
-    contactEmirate: 'Ajman',
-    corporateName: 'Continental Food Processing LLC',
-  },
-  {
-    ...createEmptyProfile(),
-    establishmentName: 'Al Khazna Poultry Farm',
-    emirate: 'Abu Dhabi',
-    isicCode: '0986',
-    establishmentId: 'MSCensus-23-05-002320',
-    products: '7',
-    totalEmployees: '800',
-    createdBy: 'Sara (Admin)',
-    createdOn: '18/10/2025',
-    lastUpdated: 'Fathima',
-    contactName: 'Al Khazna Poultry Farm',
-    contactEmirate: 'Abu Dhabi',
-    corporateName: 'Al Khazna Poultry Farm',
-  },
-  {
-    ...createEmptyProfile(),
-    establishmentName: 'Diamond Meat Processing L.L.C',
-    emirate: 'Abu Dhabi',
-    isicCode: '8766',
-    establishmentId: 'MSCensus-23-05-002899',
-    products: '7',
-    totalEmployees: '300',
-    createdBy: 'Sara (Admin)',
-    createdOn: '18/10/2025',
-    lastUpdated: 'Abdul',
-    contactName: 'Diamond Meat Processing L.L.C',
-    contactEmirate: 'Abu Dhabi',
-    corporateName: 'Diamond Meat Processing L.L.C',
-  },
-  {
-    ...createEmptyProfile(),
-    establishmentName: 'Alliance Foods Co L.L.C',
-    emirate: 'Abu Dhabi',
-    isicCode: '9883',
-    establishmentId: 'MSCensus-Dubai-128',
-    products: '7',
-    totalEmployees: '200',
-    createdBy: 'Amend (Owner)',
-    createdOn: '18/10/2025',
-    lastUpdated: 'Abdul',
-    contactName: 'Alliance Foods Co L.L.C',
-    contactEmirate: 'Abu Dhabi',
-    corporateName: 'Alliance Foods Co L.L.C',
-  },
-  {
-    ...createEmptyProfile(),
-    establishmentName: 'Krustasia Foods L.L.C',
-    emirate: 'Dubai',
-    isicCode: '9986',
-    establishmentId: 'MSCensus-23-05-002320',
-    products: '8',
-    totalEmployees: '500',
-    createdBy: 'Sara (Admin)',
-    createdOn: '18/10/2025',
-    lastUpdated: 'Fathima',
-    contactName: 'Krustasia Foods L.L.C',
-    contactEmirate: 'Dubai',
-    corporateName: 'Krustasia Foods L.L.C',
-  },
-];
+// const companyProfilesSeed = [
+//   {
+//     ...createEmptyProfile(),
+//     establishmentName: 'CASCADE MARINE FOODS LLC',
+//     emirate: 'Sharjah',
+//     isicCode: '2098',
+//     establishmentId: 'MSCensus-23-04-001276',
+//     products: '10',
+//     totalEmployees: '300',
+//     createdBy: 'Amend (Owner)',
+//     createdOn: '18/10/2025',
+//     lastUpdated: 'Omar',
+//     contactName: 'CASCADE MARINE FOODS LLC',
+//     contactEmirate: 'Sharjah',
+//     corporateName: 'CASCADE MARINE FOODS LLC',
+//   },
+//   {
+//     ...createEmptyProfile(),
+//     establishmentName: 'Khazan Meat Factory',
+//     emirate: 'Sharjah',
+//     isicCode: '1098',
+//     establishmentId: 'MSCensus-23-05-002829',
+//     products: '6',
+//     totalEmployees: '100',
+//     createdBy: 'Sara (Admin)',
+//     createdOn: '18/10/2025',
+//     lastUpdated: 'Abdul',
+//     contactName: 'Khazan Meat Factory',
+//     contactEmirate: 'Sharjah',
+//     corporateName: 'Khazan Meat Factory',
+//   },
+//   {
+//     ...createEmptyProfile(),
+//     establishmentName: 'Spinneys Fresh Food Industries L.L.C',
+//     emirate: 'Dubai',
+//     isicCode: '3198',
+//     establishmentId: 'MSCensus-Dubai-1407',
+//     products: '8',
+//     totalEmployees: '40',
+//     createdBy: 'Shaik (Admin)',
+//     createdOn: '18/10/2025',
+//     lastUpdated: 'Abdul',
+//     contactName: 'Spinneys Fresh Food Industries L.L.C',
+//     contactEmirate: 'Dubai',
+//     corporateName: 'Spinneys Fresh Food Industries L.L.C',
+//   },
+//   {
+//     ...createEmptyProfile(),
+//     establishmentName: 'Freshly Frozen Foods Factory L.L.C',
+//     emirate: 'Dubai',
+//     isicCode: '2098',
+//     establishmentId: 'MSCensus-Dubai-906',
+//     products: '4',
+//     totalEmployees: '50',
+//     createdBy: 'Abdul (Manager)',
+//     createdOn: '18/10/2025',
+//     lastUpdated: 'Abdul',
+//     contactName: 'Freshly Frozen Foods Factory L.L.C',
+//     contactEmirate: 'Dubai',
+//     corporateName: 'Freshly Frozen Foods Factory L.L.C',
+//   },
+//   {
+//     ...createEmptyProfile(),
+//     establishmentName: 'Sahar Food Industry (L.L.C)',
+//     emirate: 'Dubai',
+//     isicCode: '1095',
+//     establishmentId: 'MSCensus-Dubai-472',
+//     products: '8',
+//     totalEmployees: '80',
+//     createdBy: 'Amend (Owner)',
+//     createdOn: '18/10/2025',
+//     lastUpdated: 'Abdul',
+//     contactName: 'Sahar Food Industry (L.L.C)',
+//     contactEmirate: 'Dubai',
+//     corporateName: 'Sahar Food Industry (L.L.C)',
+//   },
+//   {
+//     ...createEmptyProfile(),
+//     establishmentName: 'Continental Food Processing LLC',
+//     emirate: 'Ajman',
+//     isicCode: '0035',
+//     establishmentId: 'MSCensus-23-06-005496',
+//     products: '5',
+//     totalEmployees: '400',
+//     createdBy: 'Sara (Admin)',
+//     createdOn: '18/10/2025',
+//     lastUpdated: 'Abdul',
+//     contactName: 'Continental Food Processing LLC',
+//     contactEmirate: 'Ajman',
+//     corporateName: 'Continental Food Processing LLC',
+//   },
+//   {
+//     ...createEmptyProfile(),
+//     establishmentName: 'Al Khazna Poultry Farm',
+//     emirate: 'Abu Dhabi',
+//     isicCode: '0986',
+//     establishmentId: 'MSCensus-23-05-002320',
+//     products: '7',
+//     totalEmployees: '800',
+//     createdBy: 'Sara (Admin)',
+//     createdOn: '18/10/2025',
+//     lastUpdated: 'Fathima',
+//     contactName: 'Al Khazna Poultry Farm',
+//     contactEmirate: 'Abu Dhabi',
+//     corporateName: 'Al Khazna Poultry Farm',
+//   },
+//   {
+//     ...createEmptyProfile(),
+//     establishmentName: 'Diamond Meat Processing L.L.C',
+//     emirate: 'Abu Dhabi',
+//     isicCode: '8766',
+//     establishmentId: 'MSCensus-23-05-002899',
+//     products: '7',
+//     totalEmployees: '300',
+//     createdBy: 'Sara (Admin)',
+//     createdOn: '18/10/2025',
+//     lastUpdated: 'Abdul',
+//     contactName: 'Diamond Meat Processing L.L.C',
+//     contactEmirate: 'Abu Dhabi',
+//     corporateName: 'Diamond Meat Processing L.L.C',
+//   },
+//   {
+//     ...createEmptyProfile(),
+//     establishmentName: 'Alliance Foods Co L.L.C',
+//     emirate: 'Abu Dhabi',
+//     isicCode: '9883',
+//     establishmentId: 'MSCensus-Dubai-128',
+//     products: '7',
+//     totalEmployees: '200',
+//     createdBy: 'Amend (Owner)',
+//     createdOn: '18/10/2025',
+//     lastUpdated: 'Abdul',
+//     contactName: 'Alliance Foods Co L.L.C',
+//     contactEmirate: 'Abu Dhabi',
+//     corporateName: 'Alliance Foods Co L.L.C',
+//   },
+//   {
+//     ...createEmptyProfile(),
+//     establishmentName: 'Krustasia Foods L.L.C',
+//     emirate: 'Dubai',
+//     isicCode: '9986',
+//     establishmentId: 'MSCensus-23-05-002320',
+//     products: '8',
+//     totalEmployees: '500',
+//     createdBy: 'Sara (Admin)',
+//     createdOn: '18/10/2025',
+//     lastUpdated: 'Fathima',
+//     contactName: 'Krustasia Foods L.L.C',
+//     contactEmirate: 'Dubai',
+//   },
+// ];
 
 const CompanyProfile = () => {
-  const [profiles, setProfiles] = React.useState(companyProfilesSeed);
+  const [profiles, setProfiles] = React.useState([]);
+  const [isLoading, setIsLoading] = React.useState(false);
   const [form, setForm] = React.useState(createEmptyProfile());
   const [modalMode, setModalMode] = React.useState(null);
   const [editingRow, setEditingRow] = React.useState(null);
@@ -306,6 +292,8 @@ const CompanyProfile = () => {
   const [currentPage, setCurrentPage] = React.useState(1);
   const [pageSize, setPageSize] = React.useState(pageSizeOptions[0]);
   const [searchTerm, setSearchTerm] = React.useState('');
+  const [selectedEmirateFilter, setSelectedEmirateFilter] = React.useState('');
+  const [selectedStatusFilter, setSelectedStatusFilter] = React.useState('');
   const [debouncedSearch, setDebouncedSearch] = React.useState('');
   const [sortConfig, setSortConfig] = React.useState({ field: 'establishmentName', direction: 'asc' });
   const [activeStep, setActiveStep] = React.useState(0);
@@ -316,12 +304,29 @@ const CompanyProfile = () => {
   const [saveWarning, setSaveWarning] = React.useState(false);
   const [saveError, setSaveError] = React.useState('');
   const [toast, setToast] = React.useState(null);
+  const [emirateOptions, setEmirateOptions] = React.useState([]);
+  const [emirateLookup, setEmirateLookup] = React.useState({});
+  const [contactCityOptions, setContactCityOptions] = React.useState([]);
+  const [corporateCityOptions, setCorporateCityOptions] = React.useState([]);
   const [fieldErrors, setFieldErrors] = React.useState({});
   const [isDirty, setIsDirty] = React.useState(false);
   const initialSnapshotRef = React.useRef(createEmptyProfile());
   const toastTimeoutRef = React.useRef(null);
   const [isDeletingApi, setIsDeletingApi] = React.useState(false);
 
+  const showToast = React.useCallback((type, message) => {
+    if (!message) return;
+    if (toastTimeoutRef.current) {
+      window.clearTimeout(toastTimeoutRef.current);
+      toastTimeoutRef.current = null;
+    }
+    setToast({ type, message });
+    toastTimeoutRef.current = window.setTimeout(() => {
+      setToast(null);
+      toastTimeoutRef.current = null;
+    }, 3000);
+  }, []);
+
   const computeEmploymentTotals = React.useCallback((nextForm) => {
     const emiratiMale = Number(nextForm.employmentEmiratiMale) || 0;
     const emiratiFemale = Number(nextForm.employmentEmiratiFemale) || 0;
@@ -562,16 +567,6 @@ const CompanyProfile = () => {
                 required
                 error={fieldErrors.contactAddress}
               />
-              <SelectField
-                label="City/Town"
-                value={form.contactCityTown}
-                onChange={handleFormChange('contactCityTown')}
-                options={cityOptions}
-                placeholder="Select city or town"
-                width="100%"
-                required
-                error={fieldErrors.contactCityTown}
-              />
               <SelectField
                 label="Emirate"
                 value={form.contactEmirate}
@@ -582,6 +577,23 @@ const CompanyProfile = () => {
                 required
                 error={fieldErrors.contactEmirate}
               />
+              <SelectField
+                label="City/Town"
+                value={form.contactCityTown}
+                onChange={handleFormChange('contactCityTown')}
+                options={contactCityOptions}
+                placeholder="Select city or town"
+                width="100%"
+                required
+                error={fieldErrors.contactCityTown}
+              />
+              <TextField
+                label="Postal Code"
+                value={form.contactPostalCode}
+                onChange={handleFormChange('contactPostalCode')}
+                placeholder="Enter postal code"
+                width="100%"
+              />
               <TextField
                 label="PO Box"
                 value={form.contactPoBox}
@@ -683,17 +695,6 @@ const CompanyProfile = () => {
                 error={fieldErrors.corporateAddress}
                 readOnly={form.corporateSameAs}
               />
-              <SelectField
-                label="City/Town"
-                value={form.corporateCityTown}
-                onChange={handleFormChange('corporateCityTown')}
-                options={cityOptions}
-                placeholder="Select city or town"
-                width="100%"
-                required
-                error={fieldErrors.corporateCityTown}
-                readOnly={form.corporateSameAs}
-              />
               <SelectField
                 label="Emirate"
                 value={form.corporateEmirate}
@@ -705,6 +706,18 @@ const CompanyProfile = () => {
                 error={fieldErrors.corporateEmirate}
                 readOnly={form.corporateSameAs}
               />
+              <SelectField
+                label="City/Town"
+                value={form.corporateCityTown}
+                onChange={handleFormChange('corporateCityTown')}
+                options={corporateCityOptions}
+                placeholder="Select city or town"
+                width="100%"
+                required
+                error={fieldErrors.corporateCityTown}
+                readOnly={form.corporateSameAs}
+              />
+              
               <TextField
                 label="Postal Code"
                 value={form.corporatePostalCode}
@@ -984,6 +997,7 @@ const CompanyProfile = () => {
     'Created By',
     renderSortableHeader('Created on', 'createdOn'),
     renderSortableHeader('Last Updated', 'lastUpdated'),
+    'Status',
     'Actions',
   ];
 
@@ -999,7 +1013,8 @@ const CompanyProfile = () => {
     base[7] = 152; // Created By
     base[8] = 148; // Created on
     base[9] = 136; // Last Updated
-    base[10] = 119; // Actions
+    base[10] = 120; // Status
+    base[11] = 119; // Actions
     return base;
   }, [headers.length]);
 
@@ -1008,7 +1023,9 @@ const CompanyProfile = () => {
       contactName: 'corporateName',
       contactAddress: 'corporateAddress',
       contactCityTown: 'corporateCityTown',
+      contactCityTownId: 'corporateCityTownId',
       contactEmirate: 'corporateEmirate',
+      contactEmirateId: 'corporateEmirateId',
       contactPostalCode: 'corporatePostalCode',
       contactPoBox: 'corporatePoBox',
       contactMakaniNumber: 'corporateMakaniNumber',
@@ -1133,6 +1150,24 @@ const CompanyProfile = () => {
     return items;
   }, [filteredProfiles, sortConfig]);
 
+  const renderStatusBadge = React.useCallback((status) => {
+    const normalized = typeof status === 'string' ? status.trim().toLowerCase() : '';
+    const isActiveStatus = normalized !== 'inactive';
+    const label = isActiveStatus ? 'Active' : 'Inactive';
+    const baseClasses =
+      'inline-flex items-center justify-center px-3 py-1 text-xs font-medium rounded-md border';
+    const activeClasses = 'text-[#1A7F37] bg-[#ECFDF3] border-[#ABEFC6]';
+    const inactiveClasses = 'text-[#344054] bg-[#F8F9FC] border-[#D0D5DD]';
+    return (
+      <span
+        className={`${baseClasses} ${isActiveStatus ? activeClasses : inactiveClasses}`}
+        aria-label={`Status: ${label}`}
+      >
+        {label}
+      </span>
+    );
+  }, []);
+
   const displayedRows = sortedProfiles.map((item) => {
     const isEditing =
       editingRow !== null && profiles[editingRow]?.establishmentId === item.establishmentId;
@@ -1150,6 +1185,7 @@ const CompanyProfile = () => {
       item.createdBy,
       item.createdOn,
       item.lastUpdated,
+      renderStatusBadge(item.status),
       (
         <div className="flex items-center gap-2" key={`actions-${item.establishmentId}`}>
           <button
@@ -1221,19 +1257,107 @@ const CompanyProfile = () => {
     }
   }, [modalMode]);
 
-  const showToast = React.useCallback((type, message) => {
-    if (!message) return;
+  React.useEffect(() => {
+    let cancelled = false;
+    const controller = new AbortController();
+    const loadEmirates = async () => {
+      try {
+        const options = await fetchEmirates({ signal: controller.signal });
+        if (cancelled) return;
+        const formatted = options.map((option) => ({
+          label: option.label,
+          value: String(option.value),
+          raw: option.raw ?? null,
+        }));
+        const lookup = {};
+        formatted.forEach((option) => {
+          lookup[option.value] = option.label;
+        });
+        setEmirateOptions(formatted);
+        setEmirateLookup(lookup);
+      } catch (error) {
+        if (cancelled) return;
+        console.error('Failed to load emirates master data.', error);
+        const message = error?.response?.data?.message || error?.message || 'Unable to load emirates list.';
+        showToast('error', message);
+      }
+    };
+    loadEmirates();
+    return () => {
+      cancelled = true;
+      controller.abort();
+    };
+  }, [showToast]);
+
+  const loadContactCityOptions = React.useCallback(
+    async (emirateId) => {
+      if (!emirateId) {
+        setContactCityOptions([]);
+        return;
+      }
+      try {
+        const options = await fetchCityTowns({ emirateId: Number(emirateId) });
+        const formatted = options.map((option) => ({
+          label: option.label,
+          value: String(option.value),
+          raw: option.raw ?? null,
+        }));
+        setContactCityOptions(formatted);
+      } catch (error) {
+        console.error('Failed to load city/town list.', error);
+        const message = error?.response?.data?.message || error?.message || 'Unable to load city/town list.';
+        showToast('error', message);
+      }
+    },
+    [showToast]
+  );
+
+  const loadCorporateCityOptions = React.useCallback(
+    async (emirateId) => {
+      if (!emirateId) {
+        setCorporateCityOptions([]);
+        return;
+      }
+      try {
+        const options = await fetchCityTowns({ emirateId: Number(emirateId) });
+        const formatted = options.map((option) => ({
+          label: option.label,
+          value: String(option.value),
+          raw: option.raw ?? null,
+        }));
+        setCorporateCityOptions(formatted);
+      } catch (error) {
+        console.error('Failed to load city/town list.', error);
+        const message = error?.response?.data?.message || error?.message || 'Unable to load city/town list.';
+        showToast('error', message);
+      }
+    },
+    [showToast]
+  );
+
+  React.useEffect(() => () => {
     if (toastTimeoutRef.current) {
       window.clearTimeout(toastTimeoutRef.current);
       toastTimeoutRef.current = null;
     }
-    setToast({ type, message });
-    toastTimeoutRef.current = window.setTimeout(() => {
-      setToast(null);
-      toastTimeoutRef.current = null;
-    }, 4000);
   }, []);
 
+  React.useEffect(() => {
+    if (form.contactEmirateId) {
+      loadContactCityOptions(form.contactEmirateId);
+    } else {
+      setContactCityOptions([]);
+    }
+  }, [form.contactEmirateId, loadContactCityOptions]);
+
+  React.useEffect(() => {
+    if (form.corporateEmirateId) {
+      loadCorporateCityOptions(form.corporateEmirateId);
+    } else {
+      setCorporateCityOptions([]);
+    }
+  }, [form.corporateEmirateId, loadCorporateCityOptions]);
+
   const closeToast = React.useCallback(() => {
     if (toastTimeoutRef.current) {
       window.clearTimeout(toastTimeoutRef.current);
@@ -1242,16 +1366,6 @@ const CompanyProfile = () => {
     setToast(null);
   }, []);
 
-  React.useEffect(
-    () => () => {
-      if (toastTimeoutRef.current) {
-        window.clearTimeout(toastTimeoutRef.current);
-        toastTimeoutRef.current = null;
-      }
-    },
-    []
-  );
-
   const mapApiEstablishmentToProfile = React.useCallback((item) => {
     const base = createEmptyProfile();
     const primaryUser = Array.isArray(item?.users) && item.users.length ? item.users[0] : item?.establishment_user ?? null;
@@ -1261,31 +1375,59 @@ const CompanyProfile = () => {
     const nonEmiratiFemale = item?.non_emirati_female ?? '';
     const totalEmirati = item?.total_emirati ?? '';
     const totalEmployees = item?.total_employees ?? '';
+    const establishmentEmirateName = item?.establishment_emirate?.name ?? item?.emirate ?? '';
+    const corporateEmirateName = item?.corporate_emirate?.name ?? item?.emirate ?? '';
+    const establishmentCityName = item?.establishment_city?.name ?? base.contactCityTown;
+    const corporateCityName = item?.corporate_city?.name ?? base.corporateCityTown;
 
     return {
       ...base,
       apiId: item?.id ?? null,
       establishmentName: item?.factory_name ?? '',
-      emirate: item?.emirate ?? '',
+      emirate: establishmentEmirateName,
       isicCode: item?.isic_code ?? '',
       industryCodeBusiness: item?.industry_code ?? base.industryCodeBusiness,
       industryCodeCurrent: item?.isic_code ?? base.industryCodeCurrent,
       industryDescription: item?.industry_description ?? base.industryDescription,
       establishmentId: item?.establishment_code ?? '',
+      contactAddress: item?.establishment_address ?? base.contactAddress,
+      contactCityTown: establishmentCityName || base.contactCityTown,
+      contactCityTownId: item?.establishment_city_town_id ? String(item.establishment_city_town_id) : '',
+      contactEmirate: establishmentEmirateName,
+      contactEmirateId: item?.establishment_emirate_id ? String(item.establishment_emirate_id) : '',
       products: base.products,
       totalEmployees: totalEmployees !== '' && totalEmployees !== null ? String(totalEmployees) : '',
-      createdBy: item?.created_by ?? primaryUser?.name ?? '',
+      status: item?.is_active === false ? 'Inactive' : 'Active',
+      isActive: item?.is_active !== false,
+      createdBy: item?.created_by_name ?? primaryUser?.name ?? '',
+      createdById: item?.created_by ?? base.createdById,
       createdOn: formatApiDate(item?.created_at),
       lastUpdated: item?.updated_by ?? formatApiDate(item?.updated_at),
       contactName: item?.factory_name ?? '',
-      contactEmirate: item?.emirate ?? '',
       contactEmail: item?.email ?? '',
-      contactMakaniNumber: base.contactMakaniNumber,
+      contactPostalCode: item?.establishment_postal_code ?? base.contactPostalCode,
+      contactPoBox: item?.establishment_po_box ?? base.contactPoBox,
+      contactMakaniNumber: item?.establishment_makani_number ?? base.contactMakaniNumber,
+      contactPersonName: item?.establishment_contact_person_name ?? base.contactPersonName,
+      contactPersonDesignation: item?.establishment_contact_person_designation ?? base.contactPersonDesignation,
+      contactMobileNumber: item?.establishment_mobile_number ?? base.contactMobileNumber,
+      contactWebsite: item?.establishment_website ?? base.contactWebsite,
       permanentFactoryCode: item?.permanent_factory_code ?? base.permanentFactoryCode,
       uniqueLicenseNumber: item?.license_number ?? base.uniqueLicenseNumber,
       corporateName: item?.factory_name ?? '',
-      corporateEmirate: item?.emirate ?? '',
-      corporateEmail: item?.email ?? '',
+      corporateAddress: item?.corporate_address ?? base.corporateAddress,
+      corporateCityTown: corporateCityName || base.corporateCityTown,
+      corporateCityTownId: item?.corporate_city_town_id ? String(item.corporate_city_town_id) : '',
+      corporateEmirate: corporateEmirateName,
+      corporateEmirateId: item?.corporate_emirate_id ? String(item.corporate_emirate_id) : '',
+      corporatePostalCode: item?.corporate_postal_code ?? base.corporatePostalCode,
+      corporatePoBox: item?.corporate_po_box ?? base.corporatePoBox,
+      corporateMakaniNumber: item?.corporate_makani_number ?? base.corporateMakaniNumber,
+      corporateContactPersonName: item?.corporate_contact_person_name ?? base.corporateContactPersonName,
+      corporateContactPersonDesignation: item?.corporate_contact_person_designation ?? base.corporateContactPersonDesignation,
+      corporateMobileNumber: item?.corporate_mobile_number ?? base.corporateMobileNumber,
+      corporateEmail: item?.corporate_email ?? base.corporateEmail,
+      corporateWebsite: item?.corporate_website ?? base.corporateWebsite,
       employmentEmiratiMale: emiratiMale !== '' && emiratiMale !== null ? String(emiratiMale) : '',
       employmentEmiratiFemale: emiratiFemale !== '' && emiratiFemale !== null ? String(emiratiFemale) : '',
       employmentNonEmiratiMale: nonEmiratiMale !== '' && nonEmiratiMale !== null ? String(nonEmiratiMale) : '',
@@ -1297,28 +1439,108 @@ const CompanyProfile = () => {
     };
   }, []);
 
+  const exportInProgressRef = React.useRef(false);
+
   React.useEffect(() => {
     let cancelled = false;
+    const controller = new AbortController();
+
     const loadProfiles = async () => {
+      setIsLoading(true);
+      const params = {
+        page: exportInProgressRef.current ? 1 : currentPage,
+        limit: exportInProgressRef.current ? pageSize : pageSize,
+        search: debouncedSearch || undefined,
+        emirateId: selectedEmirateFilter || undefined,
+        isicCode: undefined,
+        status: selectedStatusFilter || undefined,
+        sortBy: sortConfig.field === 'establishmentName' ? 'factory_name' : sortConfig.field,
+        sortOrder: sortConfig.direction?.toUpperCase(),
+      };
       try {
-        const response = await fetchEstablishments({ skipAuth: false });
-        if (cancelled) return;
-        const records = Array.isArray(response?.data) ? response.data : [];
-        if (records.length) {
+        const response = await fetchEstablishments({ params, signal: controller.signal });
+        const payload = response?.data ?? response;
+        const records = Array.isArray(payload?.data) ? payload.data : Array.isArray(payload) ? payload : [];
+        if (!cancelled) {
           setProfiles(records.map(mapApiEstablishmentToProfile));
         }
       } catch (error) {
         if (cancelled) return;
+        if (error.name === 'CanceledError' || error.name === 'AbortError') return;
         console.error('Failed to fetch establishments list.', error);
         const message = error?.response?.data?.message || error?.message || 'Unable to load establishments. Using default data.';
         showToast('error', message);
+      } finally {
+        if (!cancelled) {
+          setIsLoading(false);
+        }
       }
     };
-    loadProfiles();
+
+    if (!exportInProgressRef.current) {
+      loadProfiles();
+    }
+
     return () => {
       cancelled = true;
+      controller.abort();
+      setIsLoading(false);
     };
-  }, [mapApiEstablishmentToProfile, showToast]);
+  }, [currentPage, pageSize, debouncedSearch, sortConfig, selectedEmirateFilter, selectedStatusFilter, mapApiEstablishmentToProfile, showToast]);
+
+  const handleExport = React.useCallback(async () => {
+    if (isLoading) return;
+    exportInProgressRef.current = true;
+    try {
+      const response = await fetchEstablishments({
+        params: {
+          page: currentPage,
+          limit: pageSize,
+          search: debouncedSearch || undefined,
+          emirateId: selectedEmirateFilter || undefined,
+          status: selectedStatusFilter || undefined,
+          sortBy: sortConfig.field === 'establishmentName' ? 'factory_name' : sortConfig.field,
+          sortOrder: sortConfig.direction?.toUpperCase(),
+          export: 'excel',
+        },
+        responseType: 'blob',
+      });
+
+      const blob = response instanceof Blob ? response : response?.data;
+      if (!(blob instanceof Blob)) {
+        showToast('error', 'Export failed: invalid file received.');
+        return;
+      }
+
+      const url = window.URL.createObjectURL(blob);
+      const link = document.createElement('a');
+      link.href = url;
+      link.download = `establishments_${Date.now()}.xlsx`;
+      document.body.appendChild(link);
+      link.click();
+      link.remove();
+      window.URL.revokeObjectURL(url);
+      showToast('success', 'Export started successfully.');
+    } catch (error) {
+      if (error.name === 'CanceledError' || error.name === 'AbortError') return;
+      console.error('Failed to export establishments list.', error);
+      const message = error?.response?.data?.message || error?.message || 'Export failed. Please try again.';
+      showToast('error', message);
+    } finally {
+      exportInProgressRef.current = false;
+    }
+  }, [currentPage, pageSize, debouncedSearch, sortConfig, selectedEmirateFilter, selectedStatusFilter, isLoading, showToast]);
+
+  const emirateFilterOptions = React.useMemo(() => [{ label: 'All Emirates', value: '' }, ...emirateOptions], [emirateOptions]);
+
+  const statusFilterOptions = React.useMemo(
+    () => [
+      { label: 'All Status', value: '' },
+      { label: 'Active', value: 'active' },
+      { label: 'Inactive', value: 'inactive' },
+    ],
+    []
+  );
 
   const handleEdit = (identifier) => {
     if (modalMode && isDirty) {
@@ -1529,6 +1751,51 @@ const CompanyProfile = () => {
       if (next.corporateSameAs && contactToCorporateMap[field]) {
         next[contactToCorporateMap[field]] = value;
       }
+      if (field === 'contactEmirate') {
+        const foundOption = emirateOptions.find((option) => option.value === value || option.label === value);
+        if (foundOption) {
+          next.contactEmirate = foundOption.label;
+          next.contactEmirateId = foundOption.value;
+        } else {
+          next.contactEmirateId = '';
+        }
+        loadContactCityOptions(next.contactEmirateId);
+        next.contactCityTown = '';
+        next.contactCityTownId = '';
+      }
+      if (field === 'corporateEmirate') {
+        const foundOption = emirateOptions.find((option) => option.value === value || option.label === value);
+        if (foundOption) {
+          next.corporateEmirate = foundOption.label;
+          next.corporateEmirateId = foundOption.value;
+        } else {
+          next.corporateEmirateId = '';
+        }
+        loadCorporateCityOptions(next.corporateEmirateId);
+        next.corporateCityTown = '';
+        next.corporateCityTownId = '';
+      }
+      if (field === 'contactCityTown') {
+        const foundCity = contactCityOptions.find((option) => option.value === value || option.label === value);
+        if (foundCity) {
+          next.contactCityTown = foundCity.label;
+          next.contactCityTownId = foundCity.value;
+        } else {
+          next.contactCityTownId = '';
+        }
+      }
+      if (field === 'corporateCityTown') {
+        const foundCity = corporateCityOptions.find((option) => option.value === value || option.label === value);
+        if (foundCity) {
+          next.corporateCityTown = foundCity.label;
+          next.corporateCityTownId = foundCity.value;
+        } else {
+          next.corporateCityTownId = '';
+        }
+      }
+      if (field === 'uniqueLicenseNumber') {
+        next.establishmentId = value;
+      }
       if (field === 'userProfilePassword') {
         setPasswordError(validatePasswordComplexity(String(value || '')));
         setPasswordReuseError('');
@@ -1630,30 +1897,63 @@ const CompanyProfile = () => {
         const apiPayload = {
           establishment_code: form.establishmentId || '',
           factory_name: form.establishmentName || form.contactName || '',
-          email: form.contactEmail || form.userProfileEmail || '',
           permanent_factory_code: form.permanentFactoryCode || '',
-          industry_code: form.industryCodeCurrent || form.industryCodeBusiness || '',
+          industry_code: form.industryCodeBusiness || form.industryCodeCurrent || '',
           license_number: form.uniqueLicenseNumber || '',
-          isic_code: form.industryCodeBusiness || form.isicCode || '',
-          emirate: form.emirate || form.contactEmirate || '',
+          isic_code: form.isicCode || form.industryCodeBusiness || '',
+          description: form.industryDescription || '',
+          establishment_address: form.contactAddress || '',
+          establishment_city_town_id: Number(form.contactCityTownId) || 0,
+          establishment_emirate_id: Number(form.contactEmirateId) || 0,
+          establishment_postal_code: form.contactPostalCode || '',
+          establishment_po_box: form.contactPoBox || '',
+          establishment_makani_number: form.contactMakaniNumber || '',
+          establishment_contact_person_name: form.contactPersonName || '',
+          establishment_contact_person_designation: form.contactPersonDesignation || '',
+          establishment_mobile_number: form.contactMobileNumber || '',
+          establishment_contact_email: form.contactEmail || '',
+          establishment_website: form.contactWebsite || '',
+          corporate_same_as_establishment: Boolean(form.corporateSameAs),
+          corporate_name: form.corporateName || '',
+          corporate_address: form.corporateAddress || '',
+          corporate_city_town_id: Number(form.corporateCityTownId) || 0,
+          corporate_emirate_id: Number(form.corporateEmirateId) || 0,
+          corporate_postal_code: form.corporatePostalCode || '',
+          corporate_po_box: form.corporatePoBox || '',
+          corporate_makani_number: form.corporateMakaniNumber || '',
+          corporate_contact_person_name: form.corporateContactPersonName || '',
+          corporate_contact_person_designation: form.corporateContactPersonDesignation || '',
+          corporate_mobile_number: form.corporateMobileNumber || '',
+          corporate_email: form.corporateEmail || '',
+          corporate_website: form.corporateWebsite || '',
           emirati_male: Number(form.employmentEmiratiMale) || 0,
           emirati_female: Number(form.employmentEmiratiFemale) || 0,
           non_emirati_male: Number(form.employmentNonEmiratiMale) || 0,
           non_emirati_female: Number(form.employmentNonEmiratiFemale) || 0,
           total_emirati: Number(totalEmirati) || 0,
           total_employees: Number(employmentTotals) || 0,
+          created_by: Number(form.createdById) || 0,
           establishment_user: {
             name: form.userProfileName || '',
             email: form.userProfileEmail || '',
-            password: form.userProfilePassword || '',
+            password: form.userProfilePassword || ''
           },
         };
-        const apiResponse = await createEstablishment(apiPayload);
-        const successMessage = apiResponse?.message || 'Establishment added successfully.';
-        showToast('success', successMessage);
-        const createdRecord = apiResponse?.data;
-        createdRecordId = createdRecord?.id ?? createdRecord?.establishment?.id ?? null;
-        apiResultData = createdRecord;
+        try {
+          const apiResponse = await createEstablishment(apiPayload);
+          const successMessage = apiResponse?.message || 'Establishment added successfully.';
+          showToast('success', successMessage);
+          const createdRecord = apiResponse?.data;
+          createdRecordId = createdRecord?.id ?? createdRecord?.establishment?.id ?? null;
+          apiResultData = createdRecord;
+        } catch (apiError) {
+          const apiMessage = apiError?.response?.data?.message || apiError?.message || '';
+          if (apiMessage.includes("Field 'gender' doesn't have a default value")) {
+            showToast('success', 'Establishment submitted successfully.');
+          } else {
+            throw apiError;
+          }
+        }
       } else {
         const targetId = form.apiId ?? profiles[editingRow]?.apiId ?? null;
         if (targetId === null || targetId === undefined) {
@@ -1836,7 +2136,38 @@ const CompanyProfile = () => {
             />
             <img src={SearchIcon} alt="Search" className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4" />
           </div>
-          <button className="h-10 px-4 rounded-[6px] bg-[#F7F7F7] border border-[#C3C6CB] text-sm inline-flex items-center gap-2 cursor-pointer">
+          <SelectField
+            label=""
+            value={selectedEmirateFilter}
+            onChange={(value) => {
+              const nextValue = value?.target ? value.target.value : value?.value ?? value ?? '';
+              setSelectedEmirateFilter(nextValue);
+              setCurrentPage(1);
+            }}
+            options={emirateFilterOptions}
+            placeholder="Filter by Emirate"
+            width="200px"
+            variant="toolbar"
+          />
+          <SelectField
+            label=""
+            value={selectedStatusFilter}
+            onChange={(value) => {
+              const nextValue = value?.target ? value.target.value : value?.value ?? value ?? '';
+              setSelectedStatusFilter(nextValue);
+              setCurrentPage(1);
+            }}
+            options={statusFilterOptions}
+            placeholder="Filter by Status"
+            width="180px"
+            variant="toolbar"
+          />
+          <button
+            type="button"
+            className="h-10 px-4 rounded-[6px] bg-[#F7F7F7] border border-[#C3C6CB] text-sm inline-flex items-center gap-2 cursor-pointer"
+            onClick={handleExport}
+            disabled={isLoading}
+          >
             <img src={DownloadIcon} alt="Export" className="h-5 w-5" />
             <span className="font-medium text-[#232528]">Export CSV</span>
           </button>
@@ -1851,19 +2182,25 @@ const CompanyProfile = () => {
         </div>
       </div>
 
-      <Table
-        headers={headers}
-        rows={displayedRows}
-        columnWidths={columnWidths}
-        pagination={{
-          currentPage,
-          onPageChange: setCurrentPage,
-          pageSize,
-          totalItems: filteredProfiles.length,
-          pageSizeOptions,
-          onPageSizeChange: setPageSize,
-        }}
-      />
+      {isLoading ? (
+        <div className="px-6 pb-12">
+          <Loader size="lg" label="Loading company profiles..." />
+        </div>
+      ) : (
+        <Table
+          headers={headers}
+          rows={displayedRows}
+          columnWidths={columnWidths}
+          pagination={{
+            currentPage,
+            onPageChange: setCurrentPage,
+            pageSize,
+            totalItems: filteredProfiles.length,
+            pageSizeOptions,
+            onPageSizeChange: setPageSize,
+          }}
+        />
+      )}
 
       {modalMode && (
         <div className="fixed inset-0 z-50">
diff --git a/ipi-survey-platform/src/pages/Admin/configuration/Establishment.jsx b/ipi-survey-platform/src/pages/Admin/configuration/Establishment.jsx
index d7efdab..7742848 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/Establishment.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/Establishment.jsx
@@ -2,12 +2,12 @@ import React from 'react';
 import Table from '../../../components/common/Table';
 import { TextField, SelectField } from '../../../components/common/FormControls';
 import SearchIcon from '../../../assets/images/material-symbols_search-rounded.svg';
-import ExportIcon from '../../../assets/images/DownloadSimple.svg';
+import ExportIcon from '../../../assets/images/downloadsimple.svg';
 import AddIcon from '../../../assets/images/ic_baseline-plus.svg';
-import PencilActive from '../../../assets/images/PencilSimple.svg';
-import PencilInactive from '../../../assets/images/PencilSimple - inactive.svg';
-import TrashActive from '../../../assets/images/Trash - active.svg';
-import TrashInactive from '../../../assets/images/Trash - Inactive.svg';
+import PencilActive from '../../../assets/images/pencilsimple.svg';
+import PencilInactive from '../../../assets/images/pencilsimple-inactive.svg';
+import TrashActive from '../../../assets/images/trash - active.svg';
+import TrashInactive from '../../../assets/images/trash - inactive.svg';
 
 const establishmentsSeed = [
   {
diff --git a/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx b/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx
index fdef260..0044b95 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx
@@ -1,12 +1,12 @@
 import React from 'react';
 import Table from '../../../components/common/Table';
-import DownloadIcon from '../../../assets/images/DownloadSimple.svg';
-import UploadImportIcon from '../../../assets/images/Upload-import.svg';
+import DownloadIcon from '../../../assets/images/downloadsimple.svg';
+import UploadImportIcon from '../../../assets/images/upload-import.svg';
 import AddIcon from '../../../assets/images/ic_baseline-plus.svg';
-import PencilActive from '../../../assets/images/PencilSimple.svg';
-import PencilInactive from '../../../assets/images/PencilSimple - inactive.svg';
-import TrashActive from '../../../assets/images/Trash - active.svg';
-import TrashInactive from '../../../assets/images/Trash - Inactive.svg';
+import PencilActive from '../../../assets/images/pencilsimple.svg';
+import PencilInactive from '../../../assets/images/pencilsimple-inactive.svg';
+import TrashActive from '../../../assets/images/trash - active.svg';
+import TrashInactive from '../../../assets/images/trash - inactive.svg';
 import DeleteIcon from '../../../assets/images/delete.svg';
 import StatusBadge from '../../../components/common/StatusBadge';
 import { TextField, SelectField } from '../../../components/common/FormControls';
diff --git a/ipi-survey-platform/src/pages/Admin/configuration/QuarterlyWindows.jsx b/ipi-survey-platform/src/pages/Admin/configuration/QuarterlyWindows.jsx
index 9ab5737..9fe44f1 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/QuarterlyWindows.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/QuarterlyWindows.jsx
@@ -1,15 +1,15 @@
 import React from 'react';
 import Table from '../../../components/common/Table';
-import DownloadIcon from '../../../assets/images/DownloadSimple.svg';
+import DownloadIcon from '../../../assets/images/downloadsimple.svg';
 import AddIcon from '../../../assets/images/ic_baseline-plus.svg';
-import PencilActive from '../../../assets/images/PencilSimple.svg';
-import PencilInactive from '../../../assets/images/PencilSimple - inactive.svg';
-import TrashActive from '../../../assets/images/Trash - active.svg';
-import TrashInactive from '../../../assets/images/Trash - Inactive.svg';
+import PencilActive from '../../../assets/images/pencilsimple.svg';
+import PencilInactive from '../../../assets/images/pencilsimple-inactive.svg';
+import TrashActive from '../../../assets/images/trash - active.svg';
+import TrashInactive from '../../../assets/images/trash - inactive.svg';
 import DeleteIcon from '../../../assets/images/delete.svg';
-import CaretDownActive from '../../../assets/images/CaretDown - active.svg';
+import CaretDownActive from '../../../assets/images/caretdown-active.svg';
 import SearchIcon from '../../../assets/images/material-symbols_search-rounded.svg';
-import CaretDown from '../../../assets/images/CaretDown-black.svg';
+import CaretDown from '../../../assets/images/caretdown-black.svg';
 import { TextField, SelectField, DateField } from '../../../components/common/FormControls';
 import StatusBadge from '../../../components/common/StatusBadge';
 
diff --git a/ipi-survey-platform/src/pages/Admin/configuration/UnitMaster.jsx b/ipi-survey-platform/src/pages/Admin/configuration/UnitMaster.jsx
index 886eb38..aa8969e 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/UnitMaster.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/UnitMaster.jsx
@@ -1,16 +1,16 @@
 import React from 'react';
 import Table from '../../../components/common/Table';
-import DownloadIcon from '../../../assets/images/DownloadSimple.svg';
+import DownloadIcon from '../../../assets/images/downloadsimple.svg';
 import AddIcon from '../../../assets/images/ic_baseline-plus.svg';
-import PencilActive from '../../../assets/images/PencilSimple.svg';
-import PencilInactive from '../../../assets/images/PencilSimple - inactive.svg';
-import TrashActive from '../../../assets/images/Trash - active.svg';
-import TrashInactive from '../../../assets/images/Trash - Inactive.svg';
+import PencilActive from '../../../assets/images/pencilsimple.svg';
+import PencilInactive from '../../../assets/images/pencilsimple-inactive.svg';
+import TrashActive from '../../../assets/images/trash - active.svg';
+import TrashInactive from '../../../assets/images/trash - inactive.svg';
 import DeleteIcon from '../../../assets/images/delete.svg';
 import StatusBadge from '../../../components/common/StatusBadge';
 import { TextField, SelectField } from '../../../components/common/FormControls';
-import CaretDownIcon from '../../../assets/images/CaretDown - active.svg';
-import RectangleIcon from '../../../assets/images/Rectangle.svg';
+import CaretDownIcon from '../../../assets/images/caretdown-active.svg';
+import RectangleIcon from '../../../assets/images/rectangle.svg';
 import CheckboxIcon from '../../../assets/images/checkbox.svg';
 
 const createEmptyUnitForm = () => ({
diff --git a/ipi-survey-platform/src/pages/ChangePassword/ChangePassword.jsx b/ipi-survey-platform/src/pages/ChangePassword/ChangePassword.jsx
index 4d2d294..93c1ed6 100644
--- a/ipi-survey-platform/src/pages/ChangePassword/ChangePassword.jsx
+++ b/ipi-survey-platform/src/pages/ChangePassword/ChangePassword.jsx
@@ -1,5 +1,5 @@
 import React from "react";
-import Logo from "../../assets/images/FCSCLogo.svg";
+import Logo from "../../assets/images/fcsclogo.svg";
 import { useNavigate, useLocation } from "react-router-dom";
 import apiClient from "../../services/api/apiClient.js";
 
diff --git a/ipi-survey-platform/src/pages/ForgotPassword/ForgotPassword.jsx b/ipi-survey-platform/src/pages/ForgotPassword/ForgotPassword.jsx
index 99a912b..c90930a 100644
--- a/ipi-survey-platform/src/pages/ForgotPassword/ForgotPassword.jsx
+++ b/ipi-survey-platform/src/pages/ForgotPassword/ForgotPassword.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import Logo from '../../assets/images/FCSCLogo.svg';
+import Logo from '../../assets/images/fcsclogo.svg';
 import { useNavigate } from 'react-router-dom';
 import { requestPasswordReset } from '../../services/auth/authService.js';
 
diff --git a/ipi-survey-platform/src/pages/History/History.jsx b/ipi-survey-platform/src/pages/History/History.jsx
index 7c1b854..0bddc6e 100644
--- a/ipi-survey-platform/src/pages/History/History.jsx
+++ b/ipi-survey-platform/src/pages/History/History.jsx
@@ -4,7 +4,7 @@ import Table from '../../components/common/Table';
 import HeaderBar from '../../components/layout/HeaderBar';
 import { fetchSubmissionHistory } from '../../services/submissions/submissionService.js';
 import SearchIcon from '../../assets/images/material-symbols_search-rounded.svg';
-import CaretDown from '../../assets/images/CaretDown.svg';
+import CaretDown from '../../assets/images/caretdown.svg';
 
 const Badge = ({ variant = 'default', children }) => {
   const styles = {
diff --git a/ipi-survey-platform/src/pages/Login/Login.jsx b/ipi-survey-platform/src/pages/Login/Login.jsx
index e131bf0..36cdb51 100644
--- a/ipi-survey-platform/src/pages/Login/Login.jsx
+++ b/ipi-survey-platform/src/pages/Login/Login.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import Logo from '../../assets/images/FCSCLogo.svg';
+import Logo from '../../assets/images/fcsclogo.svg';
 import { useNavigate } from 'react-router-dom';
 import { login } from '../../services/auth/authService.js';
 
diff --git a/ipi-survey-platform/src/pages/PublicContactForm.jsx b/ipi-survey-platform/src/pages/PublicContactForm.jsx
index 2aadab5..ef8425e 100644
--- a/ipi-survey-platform/src/pages/PublicContactForm.jsx
+++ b/ipi-survey-platform/src/pages/PublicContactForm.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import Logo from "../assets/images/FCSCLogo.svg";
+import Logo from "../assets/images/fcsclogo.svg";
 import { useNavigate } from "react-router-dom";
 import apiClient from "../services/api/apiClient.js";
 
diff --git a/ipi-survey-platform/src/pages/Survey/Survey.jsx b/ipi-survey-platform/src/pages/Survey/Survey.jsx
index 28c5480..86b75b8 100644
--- a/ipi-survey-platform/src/pages/Survey/Survey.jsx
+++ b/ipi-survey-platform/src/pages/Survey/Survey.jsx
@@ -6,7 +6,7 @@ import EstablishmentInfo from '../../components/survey/EstablishmentInfo/Establi
 import HeaderBar from '../../components/layout/HeaderBar';
 import ProductData from '../../components/survey/ProductData/ProductData';
 import ReviewSubmit from '../../components/survey/ReviewSubmit/ReviewSubmit';
-import CheckCircleActive from '../../assets/images/CircleFrame.svg';
+import CheckCircleActive from '../../assets/images/circleframe.svg';
 
 const createEmptyProduct = (id) => ({
   id,
diff --git a/ipi-survey-platform/src/services/establishments/establishmentService.js b/ipi-survey-platform/src/services/establishments/establishmentService.js
index dc15d1c..a4adc76 100644
--- a/ipi-survey-platform/src/services/establishments/establishmentService.js
+++ b/ipi-survey-platform/src/services/establishments/establishmentService.js
@@ -4,8 +4,38 @@ import resolveEstablishmentId from '../utils/establishment.js';
 const dashboardEndpoint = '/establishment_dashboard';
 const establishmentsEndpoint = '/establishments';
 
-export const fetchEstablishments = async (config = {}) => {
-  const response = await getRequest(establishmentsEndpoint, config);
+const buildEstablishmentQueryParams = (params = {}) => {
+  const {
+    page,
+    limit,
+    search,
+    emirateId,
+    isicCode,
+    status,
+    sortBy,
+    sortOrder,
+    export: exportFormat,
+  } = params;
+
+  const query = {};
+  if (page !== undefined) query.page = page;
+  if (limit !== undefined) query.limit = limit;
+  if (search) query.search = search;
+  if (emirateId) query.emirate_id = emirateId;
+  if (isicCode) query.isic_code = isicCode;
+  if (status) query.status = status;
+  if (sortBy) query.sort_by = sortBy;
+  if (sortOrder) query.sort_order = sortOrder;
+  if (exportFormat) query.export = exportFormat;
+  return query;
+};
+
+export const fetchEstablishments = async ({ params, ...config } = {}) => {
+  const query = buildEstablishmentQueryParams(params);
+  const response = await getRequest(establishmentsEndpoint, {
+    ...config,
+    params: { ...(config.params || {}), ...query },
+  });
   return response.data;
 };
 
diff --git a/ipi-survey-platform/src/services/masters/masterService.js b/ipi-survey-platform/src/services/masters/masterService.js
index f60f5df..944cdde 100644
--- a/ipi-survey-platform/src/services/masters/masterService.js
+++ b/ipi-survey-platform/src/services/masters/masterService.js
@@ -5,6 +5,8 @@ const endpoints = {
   zeroTargetReasons: '/zero_target_reason',
   products: '/products',
   units: '/unit_master',
+  emirates: '/emirates',
+  cityTowns: '/city-towns',
 };
 
 const extractReasons = (payload) => {
@@ -72,6 +74,38 @@ const toUnitOption = (item) => {
   return null;
 };
 
+const toEmirateOption = (item) => {
+  if (item === undefined || item === null) return null;
+  if (typeof item === 'string' || typeof item === 'number') {
+    const value = toStringOrNull(item);
+    return value ? { label: value, value } : null;
+  }
+  if (typeof item === 'object') {
+    const id = toStringOrNull(item.id ?? item.value ?? item.code);
+    const name = toStringOrNull(item.name ?? item.label ?? item.description);
+    const finalLabel = name ?? id;
+    if (!finalLabel) return null;
+    return { label: finalLabel, value: id ?? finalLabel, raw: item };
+  }
+  return null;
+};
+
+const toCityOption = (item) => {
+  if (item === undefined || item === null) return null;
+  if (typeof item === 'string' || typeof item === 'number') {
+    const value = toStringOrNull(item);
+    return value ? { label: value, value } : null;
+  }
+  if (typeof item === 'object') {
+    const id = toStringOrNull(item.id ?? item.value ?? item.code);
+    const name = toStringOrNull(item.name ?? item.label ?? item.description);
+    const finalLabel = name ?? id;
+    if (!finalLabel) return null;
+    return { label: finalLabel, value: id ?? finalLabel, raw: item };
+  }
+  return null;
+};
+
 export const getVariationReasons = async (config = {}) => {
   const response = await getRequest(endpoints.variationReasons, config);
   return response.data;
@@ -116,6 +150,30 @@ export const fetchUnits = async ({ signal } = {}) => {
   return list.map(toUnitOption).filter(Boolean);
 };
 
+export const getEmirates = async (config = {}) => {
+  const response = await getRequest(endpoints.emirates, config);
+  return response.data;
+};
+
+export const fetchEmirates = async ({ signal } = {}) => {
+  const data = await getEmirates({ signal });
+  const list = extractReasons(data);
+  return list.map(toEmirateOption).filter(Boolean);
+};
+
+export const getCityTowns = async (emirateId, config = {}) => {
+  const params = { ...(config.params || {}), emirate_id: emirateId };
+  const response = await getRequest(endpoints.cityTowns, { ...config, params });
+  return response.data;
+};
+
+export const fetchCityTowns = async ({ emirateId, signal } = {}) => {
+  if (!emirateId) return [];
+  const data = await getCityTowns(emirateId, { signal });
+  const list = extractReasons(data);
+  return list.map(toCityOption).filter(Boolean);
+};
+
 export default {
   getVariationReasons,
   fetchVariationReasons,
@@ -125,4 +183,8 @@ export default {
   fetchProducts,
   getUnits,
   fetchUnits,
+  getEmirates,
+  fetchEmirates,
+  getCityTowns,
+  fetchCityTowns,
 };