diff --git a/src/components/MyActiveJobs/MyActiveJobTable.jsx b/src/components/MyActiveJobs/MyActiveJobTable.jsx
index c942f74..f389c3c 100644
--- a/src/components/MyActiveJobs/MyActiveJobTable.jsx
+++ b/src/components/MyActiveJobs/MyActiveJobTable.jsx
@@ -42,45 +42,49 @@ export default function MyActiveJobTable({MyJobList, className }) {
                                 MyJobList.result_list.length > 0 &&
                                 currentActiveJobList.map((value, index) => (
                                     <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                                        <td className=" py-4">
-                                            <div className="flex space-x-2 items-center">
-                                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                                                    <img
-                                                        src={dataImage2}
-                                                        alt="data"
-                                                        className="w-full h-full"
-                                                    />
-                                                </div>
-                                                <div className="flex flex-col">
-                                                    <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                                                        {value.title}
-                                                    </h1>
-                                                    <div>
-                                                        {value.description}
+                                            <td className=" py-4">
+                                                <div className="flex space-x-2 items-center">
+                                                    <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                                                        <img
+                                                            src={dataImage2}
+                                                            alt="data"
+                                                            className="w-full h-full"
+                                                        />
+                                                    </div>
+                                                    <div className="flex flex-col">
+                                                        <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                                                            {value.title}
+                                                        </h1>
+                                                        <div>
+                                                            {value.description}
+                                                        </div>
+                                                        <span className="text-sm text-thin-light-gray">
+                                                        Price: <span className="text-purple">{value.price*0.01}</span>
+                                                        </span>
+                                                        <span className="text-sm text-thin-light-gray">
+                                                        Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
+                                                        </span>
+                                                        <span className="text-sm text-thin-light-gray">
+                                                        Expire:   <span className="text-purple"> {value.expire}</span>
+                                                        </span>
+                                                        <span className="text-sm text-thin-light-gray">
+                                                        Send to:   <span className="text-purple"> {value.job_to}</span>
+                                                        </span>
+
                                                     </div>
-                                                    <span className="text-sm text-thin-light-gray">
-                                                    Price: <span className="text-purple">{value.price*0.01}</span>
-                                                    </span>
-                                                    <span className="text-sm text-thin-light-gray">
-                                                    Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
-                                                    </span>
-                                                    <span className="text-sm text-thin-light-gray">
-                                                    Expire:   <span className="text-purple"> {value.expire}</span>
-                                                    </span>
                                                 </div>
-                                            </div>
-                                        </td>
+                                            </td>
 
 
-                                        <td className="text-right py-4 px-2">
-                                            <button
-                                                type="button"
-                                                className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                                            >
-                                                View
-                                            </button>
-                                        </td>
-                                    </tr>
+                                            <td className="text-right py-4 px-2">
+                                                <button
+                                                    type="button"
+                                                    className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                                >
+                                                    View
+                                                </button>
+                                            </td>
+                                        </tr>
                                 ))}
 
 
diff --git a/src/components/Pagination/PaginatedList.jsx b/src/components/Pagination/PaginatedList.jsx
index 0df5553..bf6a1c5 100644
--- a/src/components/Pagination/PaginatedList.jsx
+++ b/src/components/Pagination/PaginatedList.jsx
@@ -3,49 +3,53 @@ import { createRoutesFromChildren } from 'react-router-dom';
 
 const PaginatedList = ({ onClick, prev, next, data, start, stop }) => {
 
-  return (
-    <div className='p-3 flex justify-center items-center space-x-2'>
-      {/* Render pagination buttons */}
-        {!prev &&
-            <button
-              className={`p-2 ${prev ? 'border' : null}`}
-              name='prev'
-              onClick={onClick}
-            >
-              <>&lt;</>
-            </button>
-          }
+  if(data.length){
+    return (
+      <div className='p-3 flex justify-center items-center space-x-2'>
+        {/* Render pagination buttons */}
+          {!prev &&
+              <button
+                className={`p-2 ${prev ? 'border' : null}`}
+                name='prev'
+                onClick={onClick}
+              >
+                <>&lt;</>
+              </button>
+            }
 
-          {
-            data.map((item, index)=>{
-                if(index%process.env.REACT_APP_ITEM_PER_PAGE == 0 && index >= start && index <= stop){
-                return (
-                  <button
-                    key={index}
-                    value={index}
-                    className={`p-2 ${index==start ? 'border' : null}`}
-                    onClick={onClick}
-                    name='page_num'
-                    disabled={index == start}
-                  >
-                    {index <= 0 ? index+1 : (index/process.env.REACT_APP_ITEM_PER_PAGE)+1}
-                  </button>
-                )
-              }
-            })
-          }
-          
-          {!next &&
-            <button
-              className={`p-2 ${next ? 'border' : null}`}
-              name='next'
-              onClick={onClick}
-            >
-              <>&gt;</>
-            </button>
-          }
-      </div>
-  );
+            {
+              data.map((item, index)=>{
+                  if(index%process.env.REACT_APP_ITEM_PER_PAGE == 0 && index >= start && index <= stop){
+                  return (
+                    <button
+                      key={index}
+                      value={index}
+                      className={`p-2 ${index==start ? 'border' : null}`}
+                      onClick={onClick}
+                      name='page_num'
+                      disabled={index == start}
+                    >
+                      {index <= 0 ? index+1 : (index/process.env.REACT_APP_ITEM_PER_PAGE)+1}
+                    </button>
+                  )
+                }
+              })
+            }
+            
+            {!next &&
+              <button
+                className={`p-2 ${next ? 'border' : null}`}
+                name='next'
+                onClick={onClick}
+              >
+                <>&gt;</>
+              </button>
+            }
+        </div>
+    )
+  }else{
+    return null
+  }
 };
 
 export default PaginatedList;