diff --git a/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx b/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx
index 94d6a27..dc5f143 100644
--- a/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx
+++ b/ipi-survey-platform/src/pages/Admin/configuration/IsicHsCodes.jsx
@@ -20,7 +20,8 @@ const createEmptyCodeForm = () => ({
   code: '',
   product: '',
   unit: '',
-  status: '',
+  status: 'Active',
+  is_active: true,
   createdBy: '',
   createdOn: '',
   updated: '',
@@ -28,7 +29,7 @@ const createEmptyCodeForm = () => ({
 });
 
 // Toast notification component
-const Toast = ({ message, type = 'success', onClose, position = 'page' }) => {
+const Toast = ({ message, type = 'success', onClose, position = 'modal' }) => {
   React.useEffect(() => {
     const timer = setTimeout(() => {
       onClose();
@@ -370,7 +371,7 @@ const IsicHsCodes = () => {
     show: false, 
     message: '', 
     type: 'success',
-    position: 'page' // 'page' or 'modal'
+    position: 'modal' // 'page' or 'modal'
   });
   const [showImportModal, setShowImportModal] = React.useState(false);
   const [isRefreshing, setIsRefreshing] = React.useState(false);
@@ -784,7 +785,7 @@ const IsicHsCodes = () => {
     setForm(createEmptyCodeForm());
   };
 
-  const showToast = (message, type = 'success', position = 'page') => {
+  const showToast = (message, type = 'success', position = 'modal') => {
     setToast({ show: true, message, type, position });
     setTimeout(() => {
       setToast(prev => ({ ...prev, show: false }));
@@ -1393,14 +1394,14 @@ const IsicHsCodes = () => {
 
               {/* Form */}
               <div className="p-6 space-y-4">
-                {/* Modal-level toast */}
                 {toast.show && toast.position === 'modal' && (
-                  <Toast 
-                    message={toast.message}
-                    type={toast.type}
-                    position="modal"
-                    onClose={() => setToast(prev => ({ ...prev, show: false }))} 
-                  />
+                  <div className="w-full mb-4">
+                    <Toast 
+                      message={toast.message}
+                      type={toast.type}
+                      onClose={() => setToast(prev => ({ ...prev, show: false }))} 
+                    />
+                  </div>
                 )}
                 <div className="grid grid-cols-2 gap-4">
                   <div>