diff --git a/Areas/Inventory/Views/InventoryMaster/ItemMovement.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemMovement.cshtml
index 36e75d7..dec10db 100644
--- a/Areas/Inventory/Views/InventoryMaster/ItemMovement.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/ItemMovement.cshtml
@@ -36,6 +36,11 @@
         color: greenyellow;
     }
 
+    .text-numb {
+        color: brown;
+    }
+
+
     .ms-auto {
         margin-left: auto !important; /* Push Complete/Incomplete to right */
     }
@@ -137,10 +142,11 @@
                         <div class="col-md-12 d-flex flex-wrap align-items-center gap-3 p-2 border-bottom">
                             <!-- Movement Type -->
                             <h3 :class="{'text-primary': movement.toOther === 'On Delivery', 'text-warning': movement.toOther === 'Return',
-                                         'text-success': movement.toStation !== null, 'text-info': movement.action === 'Assign' && movement.toStation === null}"
-                                class="flex-shrink-0 text-nowrap" style="max-width:90px; min-width:90px;">
+                                         'text-success': movement.toStation !== null, 'text-info': movement.action === 'Assign' && movement.toStation === null,
+                                        'text-numb': movement.toOther === 'Faulty' || movement.toOther === 'Calibration' ||  movement.toOther === 'Repair'}"
+                                class="flex-shrink-0 text-nowrap" style="max-width:140px; min-width:90px;">
 
-                                {{ movement.toOther === 'Return' ? 'Return' : (movement.toOther === 'On Delivery' ? 'Receive' : ( movement.toStation !== null ? 'Change' : 'Assign')) }}
+                                {{ movement.toOther === 'Return' ? 'Return' : (movement.toOther === 'On Delivery' ? 'Receive' : ( movement.toStation !== null ? 'Change' : ( movement.toOther == 'Faulty' || movement.toOther == 'Calibration' || movement.toOther == 'Repair' ? movement.toOther : 'Assign'))) }}
 
                             </h3>
 
@@ -174,9 +180,9 @@
                             </button>
 
                             <!-- Completion Status -->
-                            <h4 :class="movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'text-success' : 'text-danger'" 
+                            <h4 :class="movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'text-success' : movement.toOther === 'Repair' || movement.toOther === 'Calibration'  && movement.latestStatus === 'Ready To Deploy' ? 'text-success' :'text-danger'"
                                 class="text-nowrap ms-3">
-                                {{ movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'Complete' : (movement.latestStatus === 'Ready To Deploy' ? 'Canceled' : 'Incomplete') }}
+                                {{ movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'Complete' : ( movement.toOther === 'Repair' || movement.toOther === 'Calibration'  && movement.latestStatus === 'Ready To Deploy' ? 'Complete' : (movement.latestStatus === 'Ready To Deploy' ? 'Canceled' : 'Incomplete')) }}
                             </h4>
 
                         </div>
@@ -210,12 +216,13 @@
                                 </div>
                                 <div class="col-md-4 text-center">
                                     <!-- Conditionally render End Icon -->
-                                    <i v-if="movement.toOther !== 'On Delivery'" class="fas fa-warehouse fa-2x"></i>
+                                    <i v-if="movement.lastStation" class="fas fa-map-marker-alt"></i>
+                                    <i v-else-if="movement.toOther !== 'On Delivery'" class="fas fa-warehouse fa-2x"></i>
                                     <i v-else class="fas fa-user fa-2x"></i>
                                     <p><strong>End</strong></p>
-                                    <p><strong>User:</strong> {{ movement.lastUserName }}</p>
-                                    <p><strong>Station:</strong> {{ movement.lastStationName }}</p>
-                                    <p><strong>Store:</strong> {{ movement.lastStoreName }}</p>
+                                    <p v-if="movement.lastUser !== null"><strong>User:</strong> {{ movement.lastUserName }}</p>
+                                    <p v-if="movement.lastStation !== null"><strong>Station:</strong> {{ movement.lastStationName }}</p>
+                                    <p v-if="movement.lastStore !== null"><strong>Store:</strong> {{ movement.lastStoreName }}</p>
                                 </div>
                             </div>
                         </div>
@@ -233,12 +240,13 @@
                         <div class="col-md-12 d-flex flex-wrap align-items-center gap-3 p-2 border-bottom">
                             <!-- Movement Type -->
                             <h3 :class="{'text-primary': movement.toOther === 'On Delivery', 'text-warning': movement.toOther === 'Return',
-                                         'text-success': movement.toStation !== null, 'text-info': movement.action === 'Assign' && movement.toStation === null}"
-                                class="flex-shrink-0 text-nowrap" style="max-width:90px; min-width:90px;">
+                                         'text-success': movement.toStation !== null, 'text-info': movement.action === 'Assign' && movement.toStation === null,
+                                        'text-numb': movement.toOther === 'Faulty' || movement.toOther === 'Calibration' ||  movement.toOther === 'Repair'}"
+                                class="flex-shrink-0 text-nowrap" style="max-width:140px; min-width:90px;">
 
-                                {{ movement.toOther === 'Return' ? 'Return' : (movement.toOther === 'On Delivery' ? 'Receive' : ( movement.toStation !== null ? 'Change' : 'Assign')) }}
+                                {{ movement.toOther === 'Return' ? 'Return' : (movement.toOther === 'On Delivery' ? 'Receive' : ( movement.toStation !== null ? 'Change' : ( movement.toOther == 'Faulty' || movement.toOther == 'Calibration' || movement.toOther == 'Repair' ? movement.toOther : 'Assign'))) }}
 
-                            </h3>
+                            </h3> 
 
                             <!-- Send Date -->
                             <div class="d-flex flex-wrap align-items-center gap-2 flex-grow-1" style="max-width:285px; min-width:285px;">
@@ -269,12 +277,12 @@
                                 More Details
                             </button>
 
-                                <!-- Completion Status -->
-                                <h4 :class="movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'text-success' : 'text-danger'"
-                                    class="text-nowrap ms-3">
-                                    {{ movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'Complete' : (movement.latestStatus === 'Ready To Deploy' ? 'Canceled' : 'Incomplete') }}
-                                </h4>
-                            </div>
+                            <!-- Completion Status -->
+                            <h4 :class="movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'text-success' : movement.toOther === 'Repair' || movement.toOther === 'Calibration'  && movement.latestStatus === 'Ready To Deploy' ? 'text-success' :'text-danger'"
+                                class="text-nowrap ms-3">
+                                {{ movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'Complete' : ( movement.toOther === 'Repair' || movement.toOther === 'Calibration'  && movement.latestStatus === 'Ready To Deploy' ? 'Complete' : (movement.latestStatus === 'Ready To Deploy' ? 'Canceled' : 'Incomplete')) }}
+                            </h4>
+                        </div>
 
 
                         <!-- 📌 Details Section (Hidden by Default) -->
@@ -284,6 +292,7 @@
                                     <!-- Conditionally render Start Icon -->
                                     <i v-if="movement.toStation" class="fas fa-map-marker-alt"></i>
                                     <i v-else-if="movement.toOther !== 'On Delivery'" class="fas fa-user fa-2x"></i>
+                                    <i v-else class="fas fa-warehouse fa-2x"></i>
                                     <p><strong>Start</strong></p>
                                     <p><strong>User:</strong> {{ movement.toUserName }}</p>
                                     <p><strong>Station:</strong> {{ movement.toStationName }}</p>
@@ -306,12 +315,13 @@
                                 </div>
                                 <div class="col-md-4 text-center">
                                     <!-- Conditionally render End Icon -->
-                                    <i v-if="movement.toOther !== 'On Delivery'" class="fas fa-warehouse fa-2x"></i>
+                                    <i v-if="movement.lastStation" class="fas fa-map-marker-alt"></i>
+                                    <i v-else-if="movement.toOther !== 'On Delivery'" class="fas fa-warehouse fa-2x"></i>
                                     <i v-else class="fas fa-user fa-2x"></i>
                                     <p><strong>End</strong></p>
-                                    <p><strong>User:</strong> {{ movement.lastUserName }}</p>
-                                    <p><strong>Station:</strong> {{ movement.lastStationName }}</p>
-                                    <p><strong>Store:</strong> {{ movement.lastStoreName }}</p>
+                                    <p v-if="movement.lastUser !== null"><strong>User:</strong> {{ movement.lastUserName }}</p>
+                                    <p v-if="movement.lastStation !== null"><strong>Station:</strong> {{ movement.lastStationName }}</p>
+                                    <p v-if="movement.lastStore !== null"><strong>Store:</strong> {{ movement.lastStoreName }}</p>
                                 </div>
                             </div>
                         </div>
@@ -352,15 +362,16 @@
                                     <div v-if="index === 0" class="row">
                                         <strong>Latest Movement</strong>
                                         <div class="col-md-12 d-flex flex-wrap align-items-center gap-3 p-2 border-bottom">
-                                            <h3 :class="{'text-primary': movement.toOther === 'On Delivery', 'text-warning': movement.toOther === 'Return',
-                                         'text-success': movement.toStation !== null, 'text-info': movement.action === 'Assign' && movement.toStation === null}"
-                                                class="flex-shrink-0 text-nowrap" style="max-width:90px; min-width:90px;">
+                                        <h3 :class="{'text-primary': movement.toOther === 'On Delivery', 'text-warning': movement.toOther === 'Return',
+                                             'text-success': movement.toStation !== null, 'text-info': movement.action === 'Assign' && movement.toStation === null,
+                                            'text-numb': movement.toOther === 'Faulty' || movement.toOther === 'Calibration' ||  movement.toOther === 'Repair'}"
+                                        class="flex-shrink-0 text-nowrap" style="max-width:140px; min-width:90px;">
 
-                                                {{ movement.toOther === 'Return' ? 'Return' : (movement.toOther === 'On Delivery' ? 'Receive' : ( movement.toStation !== null ? 'Change' : 'Assign')) }}
+                                            {{ movement.toOther === 'Return' ? 'Return' : (movement.toOther === 'On Delivery' ? 'Receive' : ( movement.toStation !== null ? 'Change' : ( movement.toOther == 'Faulty' || movement.toOther == 'Calibration' || movement.toOther == 'Repair' ? movement.toOther : 'Assign'))) }}
 
-                                            </h3>
+                                        </h3>
 
-                                            <!-- Send Date -->
+                                    <!-- Send Date -->
                                             <div class="d-flex flex-wrap align-items-center gap-2 flex-grow-1" style="max-width:285px; min-width:285px;">
                                                 <h4 class="fixed-label m-0 text-nowrap">{{movement.action === 'Assign' ? 'Assign Date' : 'Send Date'}}</h4>
                                                 <span class="fixed-value text-truncate">{{ movement.sendDate }}</span>
@@ -390,9 +401,9 @@
                                             </button>
 
                                             <!-- Completion Status -->
-                                            <h4 :class="movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'text-success' : 'text-danger'"
+                                            <h4 :class="movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'text-success' : movement.toOther === 'Repair' || movement.toOther === 'Calibration'  && movement.latestStatus === 'Ready To Deploy' ? 'text-success' :'text-danger'"
                                                 class="text-nowrap ms-3">
-                                                {{ movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'Complete' : (movement.latestStatus === 'Ready To Deploy' ? 'Canceled' : 'Incomplete') }}
+                                                {{ movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'Complete' : ( movement.toOther === 'Repair' || movement.toOther === 'Calibration'  && movement.latestStatus === 'Ready To Deploy' ? 'Complete' : (movement.latestStatus === 'Ready To Deploy' ? 'Canceled' : 'Incomplete')) }}
                                             </h4>
                                         </div>
 
@@ -444,15 +455,16 @@
                                     <div v-for="(movement, i) in group.movements.slice(1)" :key="i" class="row mt-2">
                                         <div class="col-md-12 d-flex flex-wrap align-items-center gap-3 p-2 border-bottom">
                                             <!-- Movement Type -->
-                                            <h3 :class="{'text-primary': movement.toOther === 'On Delivery', 'text-warning': movement.toOther === 'Return',
-                                         'text-success': movement.toStation !== null, 'text-info': movement.action === 'Assign' && movement.toStation === null}"
-                                                class="flex-shrink-0 text-nowrap" style="max-width:90px; min-width:90px;">
+                                        <h3 :class="{'text-primary': movement.toOther === 'On Delivery', 'text-warning': movement.toOther === 'Return',
+                                             'text-success': movement.toStation !== null, 'text-info': movement.action === 'Assign' && movement.toStation === null,
+                                            'text-numb': movement.toOther === 'Faulty' || movement.toOther === 'Calibration' ||  movement.toOther === 'Repair'}"
+                                            class="flex-shrink-0 text-nowrap" style="max-width:140px; min-width:90px;">
 
-                                                {{ movement.toOther === 'Return' ? 'Return' : (movement.toOther === 'On Delivery' ? 'Receive' : ( movement.toStation !== null ? 'Change' : 'Assign')) }}
+                                            {{ movement.toOther === 'Return' ? 'Return' : (movement.toOther === 'On Delivery' ? 'Receive' : ( movement.toStation !== null ? 'Change' : ( movement.toOther == 'Faulty' || movement.toOther == 'Calibration' || movement.toOther == 'Repair' ? movement.toOther : 'Assign'))) }}
 
-                                            </h3>
+                                        </h3>
 
-                                            <!-- Send Date -->
+                                    <!-- Send Date -->
                                             <div class="d-flex flex-wrap align-items-center gap-2 flex-grow-1" style="max-width:285px; min-width:285px;">
                                                 <h4 class="fixed-label m-0 text-nowrap">{{movement.action === 'Assign' ? 'Assign Date' : 'Send Date'}}</h4>
                                                 <span class="fixed-value text-truncate">{{ movement.sendDate }}</span>
@@ -482,9 +494,9 @@
                                             </button>
 
                                             <!-- Completion Status -->
-                                            <h4 :class="movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'text-success' : 'text-danger'"
+                                            <h4 :class="movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'text-success' : movement.toOther === 'Repair' || movement.toOther === 'Calibration'  && movement.latestStatus === 'Ready To Deploy' ? 'text-success' :'text-danger'"
                                                 class="text-nowrap ms-3">
-                                                {{ movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'Complete' : (movement.latestStatus === 'Ready To Deploy' ? 'Canceled' : 'Incomplete') }}
+                                                {{ movement.movementComplete == 1 && movement.latestStatus !== 'Ready To Deploy' ? 'Complete' : ( movement.toOther === 'Repair' || movement.toOther === 'Calibration'  && movement.latestStatus === 'Ready To Deploy' ? 'Complete' : (movement.latestStatus === 'Ready To Deploy' ? 'Canceled' : 'Incomplete')) }}
                                             </h4>
                                         </div>
 
@@ -680,7 +692,7 @@
 
                         grouped[station][itemId].movements.push(movement);
                     }
-                    else if (movement.lastStation == null || movement.toStation == null) {
+                    if (movement.lastStation == null && movement.toStation == null) {
 
                         let station = "Self Assigned";
                         let itemId = movement.uniqueID;
diff --git a/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml
index f775b3c..04fa786 100644
--- a/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml
@@ -208,6 +208,7 @@
                     currentUser: null,
                     currentRequestId: "",
                     rejectremark: "",
+                    approveremark: "",
                 }
             },
             mounted() {