diff --git a/src/main/java/com/utopiaindustries/service/InventoryService.java b/src/main/java/com/utopiaindustries/service/InventoryService.java
index 659a53b..f469fbb 100644
--- a/src/main/java/com/utopiaindustries/service/InventoryService.java
+++ b/src/main/java/com/utopiaindustries/service/InventoryService.java
@@ -308,6 +308,7 @@ public class InventoryService {
             if(item.getTotalProduction() == null){
                 item.setTotalProduction(BigDecimal.ZERO);
             }
+            item.setJobCardId(jobCard.getId());
             // select which has inventory
             if (  item.getProduction( ).compareTo( BigDecimal.ZERO ) != 0 ) {
                 // production is completed out bundles
@@ -362,7 +363,7 @@ public class InventoryService {
                 stitchingOfflineItem.setCreatedBy( authentication.getName( ));
                 stitchingOfflineItem.setItemId( jobCardItem.getItemId( ));
                 stitchingOfflineItem.setSku( jobCardItem.getSku( ));
-                stitchingOfflineItem.setJobCardId( jobCardItem.getId( ));
+                stitchingOfflineItem.setJobCardId( jobCardItem.getJobCardId( ));
                 stitchingOfflineItem.setIsQa( false );
                 long id = stitchingOfflineItemDAO.save( stitchingOfflineItem);
                 stitchingOfflineItem.setId( id);
diff --git a/src/main/resources/templates/inventory-account-list.html b/src/main/resources/templates/inventory-account-list.html
index 6db5c9d..fd1cf58 100644
--- a/src/main/resources/templates/inventory-account-list.html
+++ b/src/main/resources/templates/inventory-account-list.html
@@ -36,7 +36,7 @@
                                 <td th:text="*{id}"></td>
                                 <td th:text="*{title}"></td>
                                 <td th:text="*{parentEntityType}"></td>
-                                <td th:text="*{active}" th:classappend="*{ active } ? 'badge badge-APPROVED' : 'badge badge-warning'"></td>
+                                <td > <i th:text="*{ active.equals(true) ? 'Active' : 'In-Active' }" class="font-sm" th:classappend="*{ active } ? 'badge badge-APPROVED' : 'badge badge-danger'"></i></td>
                                 <td th:text="*{createdBy}"></td>
                                 <td ctp:formatdatetime="*{createdAt}"></td>
                                 <td th:text="*{locationTitle}"></td>