diff --git a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
index 59dae4a..e7b76a2 100644
--- a/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/ThermalPrinter/PrintStyle10.jsx
@@ -461,8 +461,8 @@ const PrintStyle10 = ({
                         {table2Data?.OrderType === 'E' && estimateTitle && (
                           <div style={{ textTransform: 'uppercase' }}>
                             Estimate{' '}
-                            {SalesModePref?.SettingValue == 'Y' &&
-                              `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                            {/* {SalesModePref?.SettingValue == 'Y' &&
+                              `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                           </div>
                         )}
 
@@ -477,8 +477,8 @@ const PrintStyle10 = ({
                                 : PaymentStatusSuccess?.length === 1
                                   ? PaymentStatusSuccess?.[0]?.PaymentTypeName
                                   : ''}{' '}
-                            {SalesModePref?.SettingValue == 'Y' &&
-                              `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                            {/* {SalesModePref?.SettingValue == 'Y' &&
+                              `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                           </div>
                         )}
                       </div>
@@ -491,8 +491,8 @@ const PrintStyle10 = ({
                     style={{ textTransform: 'uppercase', textAlign: 'center' }}
                   >
                     Estimate{' '}
-                    {SalesModePref?.SettingValue == 'Y' &&
-                      `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                    {/* {SalesModePref?.SettingValue == 'Y' &&
+                      `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                   </div>
                 )}
                 <div
@@ -505,6 +505,10 @@ const PrintStyle10 = ({
                   {' '}
                   {GlobaldummyData ? formattedDate : Date1}{' '}
                 </div>
+                {SalesModePref?.SettingValue == 'Y' && <div style={{ fontSize: '13px', fontWeight: 600, textAlign: 'right' }}>
+                  {' '}
+                  Name : {table2Data?.SalesMode == "R" ? "RT" : "WS"}{' '}
+                </div>}
                 <hr class="straightline" />
               </div>
 
@@ -715,84 +719,41 @@ const PrintStyle10 = ({
                                           ? item?.BrandName
                                           : ''}
                                         &nbsp;
-                                        {item?.ProductIdentifierDtls?.length >
-                                          0
-                                          ? item?.ProductIdentifierDtls?.filter(
-                                            (items) =>
-                                              !(
-                                                items.SerialNumber == '' ||
-                                                items.SerialNumber == null
-                                              )
-                                          )?.map((a) => {
-                                            return (
-                                              <div>{a.SerialNumber}</div>
-                                            );
-                                          })
-                                          : ''}{' '}
-                                        {item?.ProductIdentifierDtls?.length >
-                                          0
-                                          ? item?.ProductIdentifierDtls.filter(
-                                            (item1) =>
-                                              item1.IMEI1 !== '' ||
-                                              item1.IMEI2 !== ''
-                                          )?.map((item2) => {
-                                            const imei1 = item2.IMEI1 || '';
-                                            const imei2 = item2.IMEI2 || '';
-                                            return (
-                                              <div>
-                                                {[imei1, imei2]
-                                                  .filter(Boolean)
-                                                  .join(',')}
-                                              </div>
-                                            );
-                                          })
-                                          : ''}
+                                        <div style={{ display: 'flex', flexDirection: 'column', gap: '3px' }}>
+                                          {item?.ProductIdentifierDtls?.map((id, i) => (
+                                            <div key={i} style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
+                                              {id.SerialNumber && <div>{id.SerialNumber}</div>}
+                                              {(id.IMEI1 || id.IMEI2) && (
+                                                <div>{[id.IMEI1, id.IMEI2].filter(Boolean).join(', ')}</div>
+                                              )}
+                                              {id.Description && <div>{id.Description}</div>}
+                                            </div>
+                                          ))}
+                                        </div>
                                       </div>
                                     ) : (
-                                      <div>
-                                        ({item?.Size ? item?.Size : '1'}{' '}
-                                        {item?.SinglePc == 'Y'
-                                          ? 'PCS'
-                                          : item?.Type != 'C'
-                                            ? item?.UomName
-                                            : 'COMBO'}
-                                        )
-                                        {item?.BrandName !== null
-                                          ? item?.BrandName
-                                          : ''}
-                                        &nbsp;
-                                        {item?.ProductIdentifierDtls?.length >
-                                          0
-                                          ? item?.ProductIdentifierDtls?.filter(
-                                            (items) =>
-                                              !(
-                                                items.SerialNumber == '' ||
-                                                items.SerialNumber == null
-                                              )
-                                          )?.map((a) => {
-                                            return (
-                                              <div>{a.SerialNumber}</div>
-                                            );
-                                          })
-                                          : ''}{' '}
-                                        {item?.ProductIdentifierDtls?.length >
-                                          0
-                                          ? item?.ProductIdentifierDtls.filter(
-                                            (item1) =>
-                                              item1.IMEI1 !== '' ||
-                                              item1.IMEI2 !== ''
-                                          )?.map((item2) => {
-                                            const imei1 = item2.IMEI1 || '';
-                                            const imei2 = item2.IMEI2 || '';
-                                            return (
-                                              <div>
-                                                {[imei1, imei2]
-                                                  .filter(Boolean)
-                                                  .join(',')}
-                                              </div>
-                                            );
-                                          })
-                                          : ''}
+                                      <div style={{ display: 'flex', flexDirection: 'column', gap: '5px' }}>
+                                        {/* Product size + brand */}
+                                        <div>
+                                          ({item?.Size || '1'}{' '}
+                                          {item?.SinglePc === 'Y'
+                                            ? 'PCS'
+                                            : item?.Type !== 'C'
+                                              ? item?.UomName
+                                              : 'COMBO'}
+                                          ) {item?.BrandName || ''}
+                                        </div>
+
+                                        {/* Product identifiers */}
+                                        {item?.ProductIdentifierDtls?.map((id, i) => (
+                                          <div key={i} style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
+                                            {id.SerialNumber && <div>{id.SerialNumber}</div>}
+                                            {(id.IMEI1 || id.IMEI2) && (
+                                              <div>{[id.IMEI1, id.IMEI2].filter(Boolean).join(', ')}</div>
+                                            )}
+                                            {id.Description && <div>{id.Description}</div>}
+                                          </div>
+                                        ))}
                                       </div>
                                     )}
                                   </td>
@@ -3121,8 +3082,8 @@ const PrintStyle10 = ({
                   {table2Data?.OrderType === 'E' && estimateTitle && (
                     <div style={{ textTransform: 'uppercase' }}>
                       Estimate{' '}
-                      {SalesModePref?.SettingValue == 'Y' &&
-                        `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                      {/* {SalesModePref?.SettingValue == 'Y' &&
+                        `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                     </div>
                   )}
 
@@ -3137,8 +3098,8 @@ const PrintStyle10 = ({
                           : PaymentStatusSuccess?.length === 1
                             ? PaymentStatusSuccess?.[0]?.PaymentTypeName
                             : ''}{' '}
-                      {SalesModePref?.SettingValue == 'Y' &&
-                        `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+                      {/* {SalesModePref?.SettingValue == 'Y' &&
+                        `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
                     </div>
                   )}
                 </div>
@@ -3148,8 +3109,8 @@ const PrintStyle10 = ({
           {!estimatePrintHeader && table2Data?.OrderType === 'E' && estimateTitle && (
             <div style={{ textTransform: 'uppercase' }}>
               Estimate{' '}
-              {SalesModePref?.SettingValue == 'Y' &&
-                `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`}
+              {/* {SalesModePref?.SettingValue == 'Y' &&
+                `(${table2Data?.SalesMode ? table2Data?.SalesMode : 'R'})`} */}
             </div>
           )}
           <div
@@ -3311,52 +3272,26 @@ const PrintStyle10 = ({
                                 {PackageDetails?.filter(
                                   (pkg) => pkg.ProdId === item.ProdId
                                 ).length > 0 ? (
-                                  <div>
-                                    {PackageDetails?.filter(
-                                      (pkg) => pkg.ProdId === item.ProdId
-                                    )?.map((item, index) => (
-                                      <span
-                                        key={index}
-                                        style={{ display: 'block' }}
-                                      >
-                                        {item.ParcelCount} PCS{' '}
-                                        {item.ParcelQty} PACK (
-                                        {item.ParcelType})
-                                      </span>
-                                    ))}
-                                    {item?.BrandName !== null
-                                      ? item?.BrandName
-                                      : ''}{' '}
-                                    &nbsp;
-                                    {item?.ProductIdentifierDtls?.length > 0
-                                      ? item?.ProductIdentifierDtls?.filter(
-                                        (items) =>
-                                          !(
-                                            items.SerialNumber == '' ||
-                                            items.SerialNumber == null
-                                          )
-                                      )?.map((a) => {
-                                        return <div>{a.SerialNumber}</div>;
-                                      })
-                                      : ''}{' '}
-                                    {item?.ProductIdentifierDtls?.length > 0
-                                      ? item?.ProductIdentifierDtls.filter(
-                                        (item1) =>
-                                          item1.IMEI1 !== '' ||
-                                          item1.IMEI2 !== ''
-                                      )?.map((item2) => {
-                                        const imei1 = item2.IMEI1 || '';
-                                        const imei2 = item2.IMEI2 || '';
-                                        return (
-                                          <div>
-                                            {[imei1, imei2]
-                                              .filter(Boolean)
-                                              .join(',')}
-                                          </div>
-                                        );
-                                      })
-                                      : ''}
-                                  </div>
+                                  <div style={{ display: 'flex', flexDirection: 'column', gap: '5px' }}>
+  {/* Package Details */}
+  {PackageDetails?.filter(pkg => pkg.ProdId === item.ProdId).map((pkg, index) => (
+    <div key={index}>
+      {pkg.ParcelCount} PCS {pkg.ParcelQty} PACK ({pkg.ParcelType})
+    </div>
+  ))}
+
+  {/* Brand */}
+  {item?.BrandName && <div>{item.BrandName}</div>}
+
+  {/* Product Identifiers */}
+  {item?.ProductIdentifierDtls?.map((id, i) => (
+    <div key={i} style={{ display: 'flex', flexDirection: 'column', gap: '2px' }}>
+      {id.SerialNumber && <div>{id.SerialNumber}</div>}
+      {(id.IMEI1 || id.IMEI2) && <div>{[id.IMEI1, id.IMEI2].filter(Boolean).join(', ')}</div>}
+      {id.Description && <div>{id.Description}</div>}
+    </div>
+  ))}
+</div>
                                 ) : (
                                   <div>
                                     ({item?.Size ? item?.Size : '1'}{' '}
@@ -3370,7 +3305,7 @@ const PrintStyle10 = ({
                                       ? item?.BrandName
                                       : ''}
                                     &nbsp;
-                                    {item?.ProductIdentifierDtls?.length > 0
+                                    {/* {item?.ProductIdentifierDtls?.length > 0
                                       ? item?.ProductIdentifierDtls?.filter(
                                         (items) =>
                                           !(
@@ -3397,7 +3332,18 @@ const PrintStyle10 = ({
                                           </div>
                                         );
                                       })
-                                      : ''}
+                                      : ''} */}
+                                    <div style={{ display: 'flex', flexDirection: 'column', gap: "3px" }}>
+                                      {item?.ProductIdentifierDtls?.map((id, i) => (
+                                        <div key={i} style={{ display: 'flex', flexDirection: 'column', gap: "2px" }}>
+                                          {id.SerialNumber && <div>{id.SerialNumber}</div>}
+                                          {(id.IMEI1 || id.IMEI2) && (
+                                            <div>{[id.IMEI1, id.IMEI2].filter(Boolean).join(', ')}</div>
+                                          )}
+                                          {id.Description && <div>{id.Description}</div>}
+                                        </div>
+                                      ))}
+                                    </div>
                                   </div>
                                 )}
                               </td>