diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Enums.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Enums.h
index e410eff..16490f1 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Enums.h
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/utilities/Enums.h
@@ -137,6 +137,10 @@ namespace util
         {
             return PaymentMode::OFFLINE;
         }
+        if (value == "NOTSET")
+        {
+            return PaymentMode::NOTSET;
+        }
         throw std::invalid_argument("Invalid PaymentMode string");
     }
 
diff --git a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h
index cd968eb..53c15f4 100644
--- a/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h
+++ b/Trenser.VehicleServiceSystem/Trenser.VehicleServiceSystem/views/MenuHelper.h
@@ -453,12 +453,12 @@ inline const Invoice* selectInvoiceToDisplay(util::Map<std::string, const Invoic
         << std::left
         << std::setw(10) << "Index"
         << std::setw(12) << "BookingID"
-        << std::setw(15) << "VehicleNumber"
-        << std::setw(20) << "TechnicianName"
-        << std::setw(15) << "TotalAmount"
-        << std::setw(25) << "InvoiceDate"
-        << std::setw(15) << "PaymentStatus"
-        << std::setw(15) << "PaymentMode"
+        << std::setw(20) << "Vehicle Number"
+        << std::setw(20) << "Technician Name"
+        << std::setw(15) << "Total Amount"
+        << std::setw(25) << "Invoice Date"
+        << std::setw(20) << "Payment Status"
+        << std::setw(15) << "Payment Mode"
         << std::endl;
     for (int iterator = 0; iterator < currentInvoices.getSize(); iterator++)
     {
@@ -471,11 +471,11 @@ inline const Invoice* selectInvoiceToDisplay(util::Map<std::string, const Invoic
         std::cout << std::left
             << std::setw(10) << currentIndex
             << std::setw(12) << currentInvoice->getBookingId()
-            << std::setw(15) << currentInvoice->getBooking()->getVehicleNumber()
+            << std::setw(20) << currentInvoice->getBooking()->getVehicleNumber()
             << std::setw(20) << ((currentTechnician && !currentTechnician->getName().empty()) ? currentTechnician->getName() : "NULL")
             << std::setw(15) << currentInvoice->getTotalAmount()
             << std::setw(25) << currentInvoice->getInvoiceDate().toString()
-            << std::setw(15) << util::getPaymentStatusString(currentInvoice->getStatus())
+            << std::setw(20) << util::getPaymentStatusString(currentInvoice->getStatus())
             << std::setw(15) << util::getPaymentModeString(currentInvoice->getPaymentMethod())
             << std::endl;
         currentInvoicesIndexMap.insert(currentIndex++, currentInvoice);