diff --git a/src/Entity/CustomerVehicle.php b/src/Entity/CustomerVehicle.php
index 75cd76d1..dc195b8a 100644
--- a/src/Entity/CustomerVehicle.php
+++ b/src/Entity/CustomerVehicle.php
@@ -23,8 +23,7 @@ class CustomerVehicle
 
     // user-defined name for vehicle
     /**
-     * @ORM\Column(type="string", length=80)
-     * @Assert\NotBlank()
+     * @ORM\Column(type="string", length=80, nullable=true)
      */
     protected $name;
 
diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig
index 8e916d07..15616462 100644
--- a/templates/customer/form.html.twig
+++ b/templates/customer/form.html.twig
@@ -151,7 +151,7 @@
 							<div class="form-group m-form__group row">
 								<div class="col-lg-3">
 									<label for="vehicle-name" data-field="name">Vehicle Name</label>
-									<input type="text" name="name" id="vehicle-name" class="form-control m-input" data-required="1">
+									<input type="text" name="name" id="vehicle-name" class="form-control m-input" data-required="0">
 									<div class="form-control-feedback hide" data-field="name"></div>
 									<span class="m-form__help">Display name for this vehicle</span>
 								</div>
@@ -957,14 +957,36 @@
 						field: 'status_condition',
 						title: 'Cond.',
 						template: function (row, index, datatable) {
-							return row.status_condition + '<div class="form-control-feedback hide" data-field="status_condition"></div>';
+							var label;
+
+							switch (row.status_condition) {
+								case 'new':
+									return 'Brand New';
+									break;
+								case 'second-hand':
+									return 'Second-Hand';
+									break;
+							}
+
+							return label + '<div class="form-control-feedback hide" data-field="status_condition"></div>';
 						}
 					},
 					{
 						field: 'fuel_type',
 						title: 'Fuel Type',
 						template: function (row, index, datatable) {
-							return row.fuel_type + '<div class="form-control-feedback hide" data-field="fuel_type"></div>';
+							var label;
+
+							switch (row.fuel_type) {
+								case 'gas':
+									return 'Gas';
+									break;
+								case 'diesel':
+									return 'Diesel';
+									break;
+							}
+
+							return label + '<div class="form-control-feedback hide" data-field="fuel_type"></div>';
 						}
 					},
 					{