diff --git a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
index d15041e..7523017 100644
--- a/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
+++ b/ipi-survey-platform/src/components/survey/ProductData/ProductData.jsx
@@ -2123,25 +2123,46 @@ useEffect(() => {
                       <label className="block text-sm font-medium text-gray-700 mb-1">
                         {quarterPeriods?.previous_month?.previous_period_one } Qty
                       </label>
-                      <div className="flex items-center h-10 px-3 py-2 text-sm text-gray-700 rounded-md w-24 border border-amber-200">
-                        {p.octQuantity || '0'}
-                      </div>
+                      <Input
+                        type="number"
+                        placeholder="Enter"
+                        value={p.octQuantity || ''}
+                        error={!!formErrors[`octQuantity_${idx}`]}
+                        onChange={(e) => updateProductField(p.id, 'octQuantity', e.target.value)}
+                      />
+                      {formErrors[`octQuantity_${idx}`] && (
+                        <p className="mt-1 text-xs text-red-600">{formErrors[`octQuantity_${idx}`]}</p>
+                      )}
                     </div>
                     <div>
                       <label className="block text-sm font-medium text-gray-700 mb-1">
                         {quarterPeriods?.previous_month?.previous_period_two } Qty
                       </label>
-                      <div className="flex items-center h-10 px-3 py-2 text-sm text-gray-700 rounded-md w-24 border border-amber-200">
-                        {p.novQuantity || '0'}
-                      </div>
+                      <Input
+                        type="number"
+                        placeholder="Enter"
+                        value={p.novQuantity || ''}
+                        error={!!formErrors[`novQuantity_${idx}`]}
+                        onChange={(e) => updateProductField(p.id, 'novQuantity', e.target.value)}
+                      />
+                      {formErrors[`novQuantity_${idx}`] && (
+                        <p className="mt-1 text-xs text-red-600">{formErrors[`novQuantity_${idx}`]}</p>
+                      )}
                     </div>
                     <div>
                       <label className="block text-sm font-medium text-gray-700 mb-1">
                         {quarterPeriods?.previous_month?.previous_period_three} Qty
                       </label>
-                      <div className="flex items-center h-10 px-3 py-2 text-sm text-gray-700 rounded-md w-24 border border-amber-200">
-                        {p.decQuantity || '0'}
-                      </div>
+                      <Input
+                        type="number"
+                        placeholder="Enter"
+                        value={p.decQuantity || ''}
+                        error={!!formErrors[`decQuantity_${idx}`]}
+                        onChange={(e) => updateProductField(p.id, 'decQuantity', e.target.value)}
+                      />
+                      {formErrors[`decQuantity_${idx}`] && (
+                        <p className="mt-1 text-xs text-red-600">{formErrors[`decQuantity_${idx}`]}</p>
+                      )}
                     </div>
                   </div>
                   <div className="flex items-end space-x-4 mt-4">
@@ -2149,25 +2170,49 @@ useEffect(() => {
                       <label className="block text-sm font-medium text-gray-700 mb-1">
                         {quarterPeriods?.previous_month?.previous_period_one } Value (<img src={uae_currency} alt="AED" className="inline-block w-5 h-5 -mt-0.5 -mb-2.4 opacity-100 -mr-1 -ml-1" />)
                       </label>
-                      <div className="flex items-center h-10 px-3 py-2 text-sm text-gray-700 rounded-md w-24 border border-amber-200">
-                        {p.octCost || '0'}
-                      </div>
+                      <Input
+                        type="text"          
+                        inputMode="decimal" 
+                        placeholder="Enter"
+                        value={p.octCost || ''}
+                        error={!!formErrors[`octCost_${idx}`]}
+                        onChange={(e) => updateProductField(p.id, 'octCost', e.target.value)}
+                      />
+                      {formErrors[`octCost_${idx}`] && (
+                        <p className="mt-1 text-xs text-red-600">{formErrors[`octCost_${idx}`]}</p>
+                      )}
                     </div>
                     <div>
                       <label className="block text-sm font-medium text-gray-700 mb-1">
                         {quarterPeriods?.previous_month?.previous_period_two } Value (<img src={uae_currency} alt="AED" className="inline-block w-5 h-5 -mt-0.5 -mb-2.4 opacity-100 -mr-1 -ml-1" />)
                       </label>
-                      <div className="flex items-center h-10 px-3 py-2 text-sm text-gray-700 rounded-md w-24 border border-amber-200">
-                        {p.novCost || '0'}
-                      </div>
+                      <Input
+                        type="text"          
+                        inputMode="decimal" 
+                        placeholder="Enter"
+                        value={p.novCost || ''}
+                        error={!!formErrors[`novCost_${idx}`]}
+                        onChange={(e) => updateProductField(p.id, 'novCost', e.target.value)}
+                      />
+                      {formErrors[`novCost_${idx}`] && (
+                        <p className="mt-1 text-xs text-red-600">{formErrors[`novCost_${idx}`]}</p>
+                      )}
                     </div>
                     <div>
                       <label className="block text-sm font-medium text-gray-700 mb-1">
                         {quarterPeriods?.previous_month?.previous_period_three } Value (<img src={uae_currency} alt="AED" className="inline-block w-5 h-5 -mt-0.5 -mb-2.4 opacity-100 -mr-1 -ml-1" />)
                       </label>
-                      <div className="flex items-center h-10 px-3 py-2 text-sm text-gray-700 rounded-md w-24 border border-amber-200">
-                        {p.decCost || '0'}
-                      </div>
+                      <Input
+                        type="text"          
+                        inputMode="decimal" 
+                        placeholder="Enter"
+                        value={p.decCost || ''}
+                        error={!!formErrors[`decCost_${idx}`]}
+                        onChange={(e) => updateProductField(p.id, 'decCost', e.target.value)}
+                      />
+                      {formErrors[`decCost_${idx}`] && (
+                        <p className="mt-1 text-xs text-red-600">{formErrors[`decCost_${idx}`]}</p>
+                      )}
                     </div>
                   </div>
                 </div>