diff --git a/src/Controller/BatteryController.php b/src/Controller/BatteryController.php
index f2923705..9991d5d5 100644
--- a/src/Controller/BatteryController.php
+++ b/src/Controller/BatteryController.php
@@ -151,6 +151,8 @@ class BatteryController extends BaseController
         $this->denyAccessUnlessGranted('battery.add', null, 'No access.');
 
         $params = $this->initParameters('battery_list');
+        $params['obj'] = new Battery();
+        $params['mode'] = 'create';
 
         $em = $this->getDoctrine()->getManager();
 
@@ -258,6 +260,7 @@ class BatteryController extends BaseController
         $this->denyAccessUnlessGranted('battery.update', null, 'No access.');
 
         $params = $this->initParameters('battery_list');
+        $params['mode'] = 'update';
 
         // get row data
         $em = $this->getDoctrine()->getManager();
@@ -273,7 +276,7 @@ class BatteryController extends BaseController
         $params['sizes'] = $em->getRepository(BatterySize::class)->findAll();
         $params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll();
 
-        $params['row'] = $row;
+        $params['obj'] = $row;
 
         // response
         return $this->render('battery/form.html.twig', $params);
diff --git a/src/Controller/BatteryManufacturerController.php b/src/Controller/BatteryManufacturerController.php
index 369156c4..1f791198 100644
--- a/src/Controller/BatteryManufacturerController.php
+++ b/src/Controller/BatteryManufacturerController.php
@@ -130,6 +130,8 @@ class BatteryManufacturerController extends BaseController
         $this->denyAccessUnlessGranted('bmfg.add', null, 'No access.');
 
         $params = $this->initParameters('bmfg_list');
+        $params['obj'] = new BatteryManufacturer();
+        $params['mode'] = 'create';
 
         // response
         return $this->render('battery-manufacturer/form.html.twig', $params);
@@ -181,6 +183,7 @@ class BatteryManufacturerController extends BaseController
         $this->denyAccessUnlessGranted('bmfg.update', null, 'No access.');
 
         $params = $this->initParameters('bmfg_list');
+        $params['mode'] = 'update';
 
         // get row data
         $em = $this->getDoctrine()->getManager();
@@ -190,8 +193,7 @@ class BatteryManufacturerController extends BaseController
         if (empty($row))
             throw $this->createNotFoundException('The item does not exist');
 
-        $params['row'] = $row;
-        $params['values'] = [];
+        $params['obj'] = $row;
 
         // response
         return $this->render('battery-manufacturer/form.html.twig', $params);
diff --git a/src/Controller/BatteryModelController.php b/src/Controller/BatteryModelController.php
index 9a26baa2..314617fc 100644
--- a/src/Controller/BatteryModelController.php
+++ b/src/Controller/BatteryModelController.php
@@ -124,6 +124,8 @@ class BatteryModelController extends BaseController
         $this->denyAccessUnlessGranted('bmodel.add', null, 'No access.');
 
         $params = $this->initParameters('bmodel_list');
+        $params['obj'] = new BatteryModel();
+        $params['mode'] = 'create';
 
         // response
         return $this->render('battery-model/form.html.twig', $params);
@@ -175,6 +177,7 @@ class BatteryModelController extends BaseController
         $this->denyAccessUnlessGranted('bmodel.update', null, 'No access.');
 
         $params = $this->initParameters('bmodel_list');
+        $params['mode'] = 'update';
 
         // get row data
         $em = $this->getDoctrine()->getManager();
@@ -184,8 +187,7 @@ class BatteryModelController extends BaseController
         if (empty($row))
             throw $this->createNotFoundException('The item does not exist');
 
-        $params['row'] = $row;
-        $params['values'] = [];
+        $params['obj'] = $row;
 
         // response
         return $this->render('battery-model/form.html.twig', $params);
diff --git a/src/Controller/BatterySizeController.php b/src/Controller/BatterySizeController.php
index e75c0b83..2a546e80 100644
--- a/src/Controller/BatterySizeController.php
+++ b/src/Controller/BatterySizeController.php
@@ -124,6 +124,8 @@ class BatterySizeController extends BaseController
         $this->denyAccessUnlessGranted('bsize.add', null, 'No access.');
 
         $params = $this->initParameters('bsize_list');
+        $params['obj'] = new BatterySize();
+        $params['mode'] = 'create';
 
         // response
         return $this->render('battery-size/form.html.twig', $params);
@@ -175,6 +177,7 @@ class BatterySizeController extends BaseController
         $this->denyAccessUnlessGranted('bsize.update', null, 'No access.');
 
         $params = $this->initParameters('bsize_list');
+        $params['mode'] = 'update';
 
         // get row data
         $em = $this->getDoctrine()->getManager();
@@ -184,8 +187,7 @@ class BatterySizeController extends BaseController
         if (empty($row))
             throw $this->createNotFoundException('The item does not exist');
 
-        $params['row'] = $row;
-        $params['values'] = [];
+        $params['obj'] = $row;
 
         // response
         return $this->render('battery-size/form.html.twig', $params);
diff --git a/src/Controller/CustomerController.php b/src/Controller/CustomerController.php
index 300e9416..7a496ae0 100644
--- a/src/Controller/CustomerController.php
+++ b/src/Controller/CustomerController.php
@@ -128,6 +128,8 @@ class CustomerController extends BaseController
         $this->denyAccessUnlessGranted('customer.add', null, 'No access.');
 
         $params = $this->initParameters('customer_list');
+        $params['obj'] = new Customer();
+        $params['mode'] = 'create';
 
         $em = $this->getDoctrine()->getManager();
 
@@ -184,6 +186,7 @@ class CustomerController extends BaseController
         $this->denyAccessUnlessGranted('customer.update', null, 'No access.');
 
         $params = $this->initParameters('customer_list');
+        $params['mode'] = 'update';
 
         // get row data
         $em = $this->getDoctrine()->getManager();
@@ -193,7 +196,7 @@ class CustomerController extends BaseController
         if (empty($row))
             throw $this->createNotFoundException('The item does not exist');
 
-        $params['row'] = $row;
+        $params['obj'] = $row;
         $params['values'] = [];
 
         // response
diff --git a/src/Controller/RoleController.php b/src/Controller/RoleController.php
index 922b354c..b8a14184 100644
--- a/src/Controller/RoleController.php
+++ b/src/Controller/RoleController.php
@@ -139,7 +139,8 @@ class RoleController extends BaseController
 
         $params = $this->initParameters('role_list');
         $this->padACLHierarchy($params);
-
+        $params['obj'] = new Role();
+        $params['mode'] = 'create';
 
         // response
         return $this->render('role/form.html.twig', $params);
@@ -204,6 +205,7 @@ class RoleController extends BaseController
 
         $params = $this->initParameters('role_list');
         $this->padACLHierarchy($params);
+        $params['mode'] = 'update';
 
         // get row data
         $em = $this->getDoctrine()->getManager();
@@ -213,7 +215,7 @@ class RoleController extends BaseController
         if (empty($row))
             throw $this->createNotFoundException('The item does not exist');
 
-        $params['row'] = $row;
+        $params['obj'] = $row;
         $params['values'] = [];
 
         // response
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 3f5e02c3..c6cfaf2a 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -128,6 +128,8 @@ class UserController extends BaseController
         $this->denyAccessUnlessGranted('user.add', null, 'No access.');
 
         $params = $this->initParameters('user_list');
+        $params['obj'] = new User();
+        $params['mode'] = 'create';
 
         // get roles
         $em = $this->getDoctrine()->getManager();
@@ -225,6 +227,7 @@ class UserController extends BaseController
         $this->denyAccessUnlessGranted('user.update', null, 'No access.');
 
         $params = $this->initParameters('user_list');
+        $params['mode'] = 'update';
 
         // get row data
         $em = $this->getDoctrine()->getManager();
@@ -238,7 +241,7 @@ class UserController extends BaseController
         $em = $this->getDoctrine()->getManager();
         $params['roles'] = $em->getRepository(Role::class)->findAll();
 
-        $params['row'] = $row;
+        $params['obj'] = $row;
         $params['values'] = [];
 
         // response
diff --git a/src/Controller/VehicleController.php b/src/Controller/VehicleController.php
index f6db4419..d2568fd0 100644
--- a/src/Controller/VehicleController.php
+++ b/src/Controller/VehicleController.php
@@ -124,6 +124,8 @@ class VehicleController extends BaseController
         $this->denyAccessUnlessGranted('vehicle.add', null, 'No access.');
 
         $params = $this->initParameters('vehicle_list');
+        $params['obj'] = new Vehicle();
+        $params['mode'] = 'create';
 
         $em = $this->getDoctrine()->getManager();
 
@@ -193,6 +195,7 @@ class VehicleController extends BaseController
         $this->denyAccessUnlessGranted('vehicle.update', null, 'No access.');
 
         $params = $this->initParameters('vehicle_list');
+        $params['mode'] = 'update';
 
         // get row data
         $em = $this->getDoctrine()->getManager();
@@ -206,7 +209,7 @@ class VehicleController extends BaseController
         $params['manufacturers'] = $em->getRepository(VehicleManufacturer::class)->findAll();
 
         $params['years'] = $this->generateYearOptions();
-        $params['row'] = $row;
+        $params['obj'] = $row;
 
         // response
         return $this->render('vehicle/form.html.twig', $params);
diff --git a/src/Controller/VehicleManufacturerController.php b/src/Controller/VehicleManufacturerController.php
index 09374a79..641c0892 100644
--- a/src/Controller/VehicleManufacturerController.php
+++ b/src/Controller/VehicleManufacturerController.php
@@ -124,6 +124,8 @@ class VehicleManufacturerController extends BaseController
         $this->denyAccessUnlessGranted('vmfg.add', null, 'No access.');
 
         $params = $this->initParameters('vmfg_list');
+        $params['obj'] = new VehicleManufacturer();
+        $params['mode'] = 'create';
 
         // response
         return $this->render('vehicle-manufacturer/form.html.twig', $params);
@@ -175,6 +177,7 @@ class VehicleManufacturerController extends BaseController
         $this->denyAccessUnlessGranted('vmfg.update', null, 'No access.');
 
         $params = $this->initParameters('vmfg_list');
+        $params['mode'] = 'update';
 
         // get row data
         $em = $this->getDoctrine()->getManager();
@@ -184,7 +187,7 @@ class VehicleManufacturerController extends BaseController
         if (empty($row))
             throw $this->createNotFoundException('The item does not exist');
 
-        $params['row'] = $row;
+        $params['obj'] = $row;
         $params['values'] = [];
 
         // response
diff --git a/templates/battery-manufacturer/form.html.twig b/templates/battery-manufacturer/form.html.twig
index 2b0f9505..81aa2bb9 100644
--- a/templates/battery-manufacturer/form.html.twig
+++ b/templates/battery-manufacturer/form.html.twig
@@ -22,9 +22,9 @@
 									<i class="la la-industry"></i>
 								</span>
 								<h3 class="m-portlet__head-text">
-									{% if row is defined %}
+									{% if mode == 'update' %}
 										Edit Manufacturer
-										<small>{{ row.getName() }}</small>
+										<small>{{ obj.getName() }}</small>
 									{% else %}
 										New Manufacturer
 									{% endif %}
@@ -32,18 +32,18 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ row is defined ? url('bmfg_update_submit', {'id': row.getId()}) : url('bmfg_create_submit') }}">
-						<div class="m-portlet__body">	
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('bmfg_update_submit', {'id': obj.getId()}) : url('bmfg_create_submit') }}">
+						<div class="m-portlet__body">
 							<div class="form-group m-form__group row">
 								<label class="col-lg-3 col-form-label" data-field="name">
 									Name:
 								</label>
 								<div class="col-lg-9">
-									<input type="text" name="name" class="form-control m-input" value="{{ values.name is defined ? values.name : (row is defined ? row.getName()) }}">
+									<input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
 									<div class="form-control-feedback hide" data-field="name"></div>
 									<span class="m-form__help">Display name for this manufacturer</span>
 								</div>
-							</div>	
+							</div>
 			            </div>
 			            <div class="m-portlet__foot m-portlet__foot--fit">
 							<div class="m-form__actions m-form__actions--solid m-form__actions--right">
diff --git a/templates/battery-model/form.html.twig b/templates/battery-model/form.html.twig
index fa19d61f..7079ca26 100644
--- a/templates/battery-model/form.html.twig
+++ b/templates/battery-model/form.html.twig
@@ -22,9 +22,9 @@
 									<i class="fa fa-cube"></i>
 								</span>
 								<h3 class="m-portlet__head-text">
-									{% if row is defined %}
+									{% if mode == 'update' %}
 										Edit Model
-										<small>{{ row.getName() }}</small>
+										<small>{{ obj.getName() }}</small>
 									{% else %}
 										New Model
 									{% endif %}
@@ -32,14 +32,14 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ row is defined ? url('bmodel_update_submit', {'id': row.getId()}) : url('bmodel_create_submit') }}">
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('bmodel_update_submit', {'id': obj.getId()}) : url('bmodel_create_submit') }}">
 						<div class="m-portlet__body">	
 							<div class="form-group m-form__group row">
 								<label class="col-lg-3 col-form-label" data-field="name">
 									Name:
 								</label>
 								<div class="col-lg-9">
-									<input type="text" name="name" class="form-control m-input" value="{{ values.name is defined ? values.name : (row is defined ? row.getName()) }}">
+									<input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
 									<div class="form-control-feedback hide" data-field="name"></div>
 									<span class="m-form__help">Display name for this model</span>
 								</div>
diff --git a/templates/battery-size/form.html.twig b/templates/battery-size/form.html.twig
index fb2eab3e..5f7406e4 100644
--- a/templates/battery-size/form.html.twig
+++ b/templates/battery-size/form.html.twig
@@ -22,9 +22,9 @@
 									<i class="flaticon-app"></i>
 								</span>
 								<h3 class="m-portlet__head-text">
-									{% if row is defined %}
+									{% if mode == 'update' %}
 										Edit Size
-										<small>{{ row.getName() }}</small>
+										<small>{{ obj.getName() }}</small>
 									{% else %}
 										New Size
 									{% endif %}
@@ -32,14 +32,14 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ row is defined ? url('bsize_update_submit', {'id': row.getId()}) : url('bsize_create_submit') }}">
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('bsize_update_submit', {'id': obj.getId()}) : url('bsize_create_submit') }}">
 						<div class="m-portlet__body">	
 							<div class="form-group m-form__group row">
 								<label class="col-lg-3 col-form-label" data-field="name">
 									Name:
 								</label>
 								<div class="col-lg-9">
-									<input type="text" name="name" class="form-control m-input" value="{{ values.name is defined ? values.name : (row is defined ? row.getName()) }}">
+									<input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
 									<div class="form-control-feedback hide" data-field="name"></div>
 									<span class="m-form__help">Display name for this size</span>
 								</div>
diff --git a/templates/battery/form.html.twig b/templates/battery/form.html.twig
index dafd0455..32da2479 100644
--- a/templates/battery/form.html.twig
+++ b/templates/battery/form.html.twig
@@ -22,9 +22,9 @@
 									<i class="fa fa-battery-3"></i>
 								</span>
 								<h3 class="m-portlet__head-text">
-									{% if row is defined %}
+									{% if mode == 'update' %}
 										Edit Battery
-										<small>{{ row.getProductCode() }}</small>
+										<small>{{ obj.getProductCode() }}</small>
 									{% else %}
 										New Battery
 									{% endif %}
@@ -32,7 +32,7 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--label-align-right" method="post" action="{{ row is defined ? url('battery_update_submit', {'id': row.getId()}) : url('battery_create_submit') }}">
+                    <form id="row-form" class="m-form m-form--label-align-right" method="post" action="{{ mode == 'update' ? url('battery_update_submit', {'id': obj.getId()}) : url('battery_create_submit') }}">
 						<div class="m-portlet__body">	
 							<ul class="nav nav-tabs" role="tablist">
 								<li class="nav-item">
@@ -55,7 +55,7 @@
 												Product Code:
 											</label>
 											<div class="col-lg-3">
-												<input type="text" name="prod_code" class="form-control m-input" value="{{ row is defined ? row.getProductCode() }}">
+												<input type="text" name="prod_code" class="form-control m-input" value="{{ obj.getProductCode() }}">
 												<div class="form-control-feedback hide" data-field="prod_code"></div>
 												<span class="m-form__help">Unique identifier for this product</span>
 											</div>
@@ -63,7 +63,7 @@
 												Selling Price:
 											</label>
 											<div class="col-lg-3">
-												<input type="text" name="sell_price" class="form-control m-input" value="{{ row is defined ? row.getSellingPrice() }}">
+												<input type="text" name="sell_price" class="form-control m-input" value="{{ obj.getSellingPrice() }}">
 												<div class="form-control-feedback hide" data-field="sell_price"></div>
 											</div>
 										</div>
@@ -75,7 +75,7 @@
 												<select class="form-control m-input" id="manufacturer" name="manufacturer">
 													<option value=""></option>
 													{% for manufacturer in bmfgs %}
-														<option value="{{ manufacturer.getID() }}"{{ row is defined and manufacturer.getID() == row.getManufacturer().getID() ? ' selected' }}>{{ manufacturer.getName() }}</option>
+														<option value="{{ manufacturer.getID() }}"{{ obj.getManufacturer() and manufacturer.getID() == obj.getManufacturer().getID() ? ' selected' }}>{{ manufacturer.getName() }}</option>
 													{% endfor %}
 												</select>
 												<div class="form-control-feedback hide" data-field="manufacturer"></div>
@@ -87,7 +87,7 @@
 												<select class="form-control m-input" id="model" name="model">
 													<option value=""></option>
 													{% for model in models %}
-														<option value="{{ model.getID() }}"{{ row is defined and model.getID() == row.getModel().getID() ? ' selected' }}>{{ model.getName() }}</option>
+														<option value="{{ model.getID() }}"{{ obj.getModel() and obj.getModel().getID() ? ' selected' }}>{{ model.getName() }}</option>
 													{% endfor %}
 												</select>
 												<div class="form-control-feedback hide" data-field="model"></div>
@@ -99,7 +99,7 @@
 												<select class="form-control m-input" id="size" name="size">
 													<option value=""></option>
 													{% for size in sizes %}
-														<option value="{{ size.getID() }}"{{ row is defined and size.getID() == row.getSize().getID() ? ' selected' }}>{{ size.getName() }}</option>
+														<option value="{{ size.getID() }}"{{ obj.getSize() and obj.getSize().getID() ? ' selected' }}>{{ size.getName() }}</option>
 													{% endfor %}
 												</select>
 												<div class="form-control-feedback hide" data-field="size"></div>
@@ -118,7 +118,7 @@
 												Personal:
 											</label>
 											<div class="col-lg-3">
-												<input type="number" name="warr_personal" class="form-control m-input" value="{{ row is defined ? row.getWarrantyPersonal() }}">
+												<input type="number" name="warr_personal" class="form-control m-input" value="{{ obj.getWarrantyPersonal() }}">
 												<div class="form-control-feedback hide" data-field="warr_personal"></div>
 												<span class="m-form__help">In months</span>
 											</div>
@@ -126,7 +126,7 @@
 												Commercial:
 											</label>
 											<div class="col-lg-3">
-												<input type="number" name="warr_commercial" class="form-control m-input" value="{{ row is defined ? row.getWarrantyCommercial() }}">
+												<input type="number" name="warr_commercial" class="form-control m-input" value="{{ obj.getWarrantyCommercial() }}">
 												<div class="form-control-feedback hide" data-field="warr_commercial"></div>
 												<span class="m-form__help">In months</span>
 											</div>
@@ -143,7 +143,7 @@
 												Length:
 											</label>
 											<div class="col-lg-3">
-												<input type="number" name="length" class="form-control m-input" value="{{ row is defined ? row.getLength() }}">
+												<input type="number" name="length" class="form-control m-input" value="{{ obj.getLength() }}">
 												<div class="form-control-feedback hide" data-field="length"></div>
 												<span class="m-form__help">In millimeters (mm)</span>
 											</div>
@@ -151,7 +151,7 @@
 												Width:
 											</label>
 											<div class="col-lg-3">
-												<input type="number" name="width" class="form-control m-input" value="{{ row is defined ? row.getWidth() }}">
+												<input type="number" name="width" class="form-control m-input" value="{{ obj.getWidth() }}">
 												<div class="form-control-feedback hide" data-field="width"></div>
 												<span class="m-form__help">In millimeters (mm)</span>
 											</div>
@@ -159,7 +159,7 @@
 												Height:
 											</label>
 											<div class="col-lg-3">
-												<input type="number" name="height" class="form-control m-input" value="{{ row is defined ? row.getHeight() }}">
+												<input type="number" name="height" class="form-control m-input" value="{{ obj.getHeight() }}">
 												<div class="form-control-feedback hide" data-field="height"></div>
 												<span class="m-form__help">In millimeters (mm)</span>
 											</div>
@@ -169,7 +169,7 @@
 												Total Height:
 											</label>
 											<div class="col-lg-3">
-												<input type="number" name="total_height" class="form-control m-input" value="{{ row is defined ? row.getTotalHeight() }}">
+												<input type="number" name="total_height" class="form-control m-input" value="{{ obj.getTotalHeight() }}">
 												<div class="form-control-feedback hide" data-field="total_height"></div>
 												<span class="m-form__help">In millimeters (mm)</span>
 											</div>
@@ -177,7 +177,7 @@
 												Reserve Capacity
 											</label>
 											<div class="col-lg-3">
-												<input type="number" name="res_capacity" class="form-control m-input" value="{{ row is defined ? row.getReserveCapacity() }}">
+												<input type="number" name="res_capacity" class="form-control m-input" value="{{ obj.getReserveCapacity() }}">
 												<div class="form-control-feedback hide" data-field="res_capacity"></div>
 												<span class="m-form__help">In minutes</span>
 											</div>
@@ -312,20 +312,18 @@
 			var vehicleRows = [];
 			var vehicleIds = [];
 
-			{% if row is defined %}
-				{% for vehicle in row.getVehicles() %}
-					vrow = {
-						id: "{{ vehicle.getID() }}",
-						mfg_name: "{{ vehicle.getManufacturer().getName() }}",
-						make: "{{ vehicle.getMake() }}",
-						model_year_from: "{{ vehicle.getModelYearFrom() }}",
-						model_year_to: "{{ vehicle.getModelYearTo() }}"
-					};
+			{% for vehicle in obj.getVehicles() %}
+				vrow = {
+					id: "{{ vehicle.getID() }}",
+					mfg_name: "{{ vehicle.getManufacturer().getName() }}",
+					make: "{{ vehicle.getMake() }}",
+					model_year_from: "{{ vehicle.getModelYearFrom() }}",
+					model_year_to: "{{ vehicle.getModelYearTo() }}"
+				};
 
-					vehicleRows.push(vrow);
-					vehicleIds.push("{{ vehicle.getID() }}");
-				{% endfor %}
-			{% endif %}
+				vehicleRows.push(vrow);
+				vehicleIds.push("{{ vehicle.getID() }}");
+			{% endfor %}
 
 			// update vehicle list when changing manufacturer
 			$("#vmfg").change(function() {
diff --git a/templates/customer/form.html.twig b/templates/customer/form.html.twig
index b36ac66e..f458f678 100644
--- a/templates/customer/form.html.twig
+++ b/templates/customer/form.html.twig
@@ -22,9 +22,9 @@
 									<i class="la la-industry"></i>
 								</span>
 								<h3 class="m-portlet__head-text">
-									{% if row is defined %}
+									{% if mode == 'update' %}
 										Edit Customer
-										<small>{{ row.getFirstName() ~ ' ' ~ row.getLastName() }}</small>
+										<small>{{ obj.getFirstName() ~ ' ' ~ obj.getLastName() }}</small>
 									{% else %}
 										New Customer
 									{% endif %}
@@ -32,7 +32,7 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--label-align-right" method="post" action="{{ row is defined ? url('customer_update_submit', {'id': row.getId()}) : url('customer_create_submit') }}">
+                    <form id="row-form" class="m-form m-form--label-align-right" method="post" action="{{ mode == 'update' ? url('customer_update_submit', {'id': obj.getId()}) : url('customer_create_submit') }}">
 						<div class="m-portlet__body">	
 							<ul class="nav nav-tabs" role="tablist">
 								<li class="nav-item">
@@ -52,14 +52,14 @@
 											First Name:
 										</label>
 										<div class="col-lg-4">
-											<input type="text" name="first_name" class="form-control m-input" value="{{ row is defined ? row.getFirstName() }}">
+											<input type="text" name="first_name" class="form-control m-input" value="{{ obj.getFirstName() }}">
 											<div class="form-control-feedback hide" data-field="first_name"></div>
 										</div>
 										<label class="col-lg-2 col-form-label" data-field="last_name">
 											Last Name:
 										</label>
 										<div class="col-lg-4">
-											<input type="text" name="last_name" class="form-control m-input" value="{{ row is defined ? row.getLastName() }}">
+											<input type="text" name="last_name" class="form-control m-input" value="{{ obj.getLastName() }}">
 											<div class="form-control-feedback hide" data-field="last_name"></div>
 										</div>
 									</div>	
diff --git a/templates/role/form.html.twig b/templates/role/form.html.twig
index af3c2c7c..01e4e7ac 100644
--- a/templates/role/form.html.twig
+++ b/templates/role/form.html.twig
@@ -22,9 +22,9 @@
 									<i class="la la-key"></i>
 								</span>
 								<h3 class="m-portlet__head-text">
-									{% if row is defined %}
+									{% if mode == 'update' %}
 										Edit Role
-										<small>{{ row.getID() }}</small>
+										<small>{{ obj.getID() }}</small>
 									{% else %}
 										New Role
 									{% endif %}
@@ -32,14 +32,14 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ row is defined ? url('role_update_submit', {'id': row.getID()}) : url('role_create_submit') }}">
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('role_update_submit', {'id': obj.getID()}) : url('role_create_submit') }}">
 						<div class="m-portlet__body">	
 							<div class="form-group m-form__group row no-border">
 								<label class="col-lg-3 col-form-label" data-field="id">
 									Role ID:
 								</label>
 								<div class="col-lg-9">
-									<input type="text" name="id" class="form-control m-input" value="{{ row is defined ? row.getID() }}">
+									<input type="text" name="id" class="form-control m-input" value="{{ obj.getID() }}">
 									<div class="form-control-feedback hide" data-field="id"></div>
 									<span class="m-form__help">Unique identifier for this role</span>
 								</div>
@@ -49,7 +49,7 @@
 									Name:
 								</label>
 								<div class="col-lg-9">
-									<input type="text" name="name" class="form-control m-input" value="{{ row is defined ? row.getName() }}">
+									<input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
 									<div class="form-control-feedback hide" data-field="name"></div>
 									<span class="m-form__help">Display name for this role</span>
 								</div>
@@ -64,7 +64,7 @@
                                         <b>{{ acl_layer.label }}</b><br>
                                         {% for key, label in acl_layer.acls %}
                                         <label class="m-checkbox">
-                                            <input type="checkbox" name="acl[]" value="{{ key }}" {{ (row is defined and row.hasACLAccess(key)) ? 'checked' : '' }}>
+                                            <input type="checkbox" name="acl[]" value="{{ key }}" {{ obj.hasACLAccess(key) ? 'checked' : '' }}>
                                             {{ label }}
                                             <span></span>
                                         </label>
diff --git a/templates/user/form.html.twig b/templates/user/form.html.twig
index 759f4137..e505cf31 100644
--- a/templates/user/form.html.twig
+++ b/templates/user/form.html.twig
@@ -22,9 +22,9 @@
 									<i class="la la-user"></i>
 								</span>
 								<h3 class="m-portlet__head-text">
-									{% if row is defined %}
+									{% if mode == 'update' %}
 										Edit User
-										<small>{{ row.getUsername() }}</small>
+										<small>{{ obj.getUsername() }}</small>
 									{% else %}
 										New User
 									{% endif %}
@@ -32,7 +32,7 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ row is defined ? url('user_update_submit', {'id': row.getId()}) : url('user_create_submit') }}">
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('user_update_submit', {'id': obj.getId()}) : url('user_create_submit') }}">
 
 						<div class="m-portlet__body">
 							<div class="form-group m-form__group row no-border">
@@ -40,7 +40,7 @@
 									Username:
 								</label>
 								<div class="col-lg-4">
-									<input type="text" name="username" class="form-control m-input" value="{{ values.username is defined ? values.username : (row is defined ? row.getUsername()) }}">
+									<input type="text" name="username" class="form-control m-input" value="{{ obj.getUsername() }}">
 									<div class="form-control-feedback hide" data-field="username"></div>
 									<span class="m-form__help">Unique alias for this user</span>
 								</div>
@@ -69,14 +69,14 @@
 									First Name:
 								</label>
 								<div class="col-lg-4">
-									<input type="text" name="first_name" class="form-control m-input" value="{{ values.first_name is defined ? values.first_name : (row is defined ? row.getFirstName()) }}">
+									<input type="text" name="first_name" class="form-control m-input" value="{{ obj.getFirstName() }}">
 									<div class="form-control-feedback hide" data-field="first_name"></div>
 								</div>
 								<label class="col-lg-2 col-form-label" data-field="last_name">
 									Last Name:
 								</label>
 								<div class="col-lg-4">
-									<input type="text" name="last_name" class="form-control m-input" value="{{ values.last_name is defined ? values.last_name : (row is defined ? row.getLastName()) }}">
+									<input type="text" name="last_name" class="form-control m-input" value="{{ obj.getLastName() }}">
 									<div class="form-control-feedback hide" data-field="last_name"></div>
 								</div>
 							</div>
@@ -85,14 +85,14 @@
 									E-mail Address:
 								</label>
 								<div class="col-lg-4">
-									<input type="email" name="email" class="form-control m-input" value="{{ values.email is defined ? values.email : (row is defined ? row.getEmail()) }}">
+									<input type="email" name="email" class="form-control m-input" value="{{ obj.getEmail() }}">
 									<div class="form-control-feedback hide" data-field="email"></div>
 								</div>
 								<label class="col-lg-2 col-form-label" data-field="contact_no">
 									Contact Number:
 								</label>
 								<div class="col-lg-4">
-									<input type="text" name="contact_no" class="form-control m-input" value="{{ values.contact_no is defined ? values.contact_no : (row is defined ? row.getContactNumber()) }}">
+									<input type="text" name="contact_no" class="form-control m-input" value="{{ obj.getContactNumber() }}">
 									<div class="form-control-feedback hide" data-field="contact_no"></div>
 								</div>
 							</div>
@@ -106,7 +106,7 @@
                                         {% if role.isSuperAdmin and not is_granted('user.role.sadmin') %}
                                         {% else %}
 										<label class="m-checkbox">
-											<input type="checkbox" name="roles[]" value="{{ role.getID() }}"{{ (values.roles is defined and role.getID() in value.roles) or (row is defined and values.roles is not defined and role.getID() in row.getRoles()) ? ' checked' : '' }}>
+											<input type="checkbox" name="roles[]" value="{{ role.getID() }}"{{ role.getID() in obj.getRoles() ? ' checked' : '' }}>
 											{{ role.getName() }}
 											<span></span>
 										</label>
@@ -124,7 +124,7 @@
 								<div class="col-lg-10">
 									<span class="m-switch m-switch--icon">
 										<label>
-											<input type="checkbox" name="enabled" value="1"{{ (values.enabled is defined and values.enabled) or (row is defined and values.enabled is not defined and row.isEnabled()) or (values.enabled is not defined and row is not defined) ? ' checked' }}>
+											<input type="checkbox" name="enabled" value="1"{{ obj.isEnabled() ? ' checked' }}>
 											<span></span>
 										</label>
 									</span>
diff --git a/templates/vehicle-manufacturer/form.html.twig b/templates/vehicle-manufacturer/form.html.twig
index 13e630a2..4f2dd831 100644
--- a/templates/vehicle-manufacturer/form.html.twig
+++ b/templates/vehicle-manufacturer/form.html.twig
@@ -22,9 +22,9 @@
 									<i class="la la-industry"></i>
 								</span>
 								<h3 class="m-portlet__head-text">
-									{% if row is defined %}
+									{% if mode == 'update' %}
 										Edit Manufacturer
-										<small>{{ row.getName() }}</small>
+										<small>{{ obj.getName() }}</small>
 									{% else %}
 										New Manufacturer
 									{% endif %}
@@ -32,14 +32,14 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ row is defined ? url('vmfg_update_submit', {'id': row.getId()}) : url('vmfg_create_submit') }}">
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('vmfg_update_submit', {'id': obj.getId()}) : url('vmfg_create_submit') }}">
 						<div class="m-portlet__body">	
 							<div class="form-group m-form__group row">
 								<label class="col-lg-3 col-form-label" data-field="name">
 									Name:
 								</label>
 								<div class="col-lg-9">
-									<input type="text" name="name" class="form-control m-input" value="{{ values.name is defined ? values.name : (row is defined ? row.getName()) }}">
+									<input type="text" name="name" class="form-control m-input" value="{{ obj.getName() }}">
 									<div class="form-control-feedback hide" data-field="name"></div>
 									<span class="m-form__help">Display name for this manufacturer</span>
 								</div>
diff --git a/templates/vehicle/form.html.twig b/templates/vehicle/form.html.twig
index e4ce3be3..1ff384ea 100644
--- a/templates/vehicle/form.html.twig
+++ b/templates/vehicle/form.html.twig
@@ -22,9 +22,9 @@
 									<i class="fa fa-car"></i>
 								</span>
 								<h3 class="m-portlet__head-text">
-									{% if row is defined %}
+									{% if mode == 'update' %}
 										Edit Vehicle
-										<small>{{ row.getManufacturer().getName() ~ ' ' ~ row.getMake() ~ row.getModelYearFrom() ~ '-' ~ row.getModelYearTo() }}</small>
+										<small>{{ obj.getManufacturer().getName() ~ ' ' ~ obj.getMake() ~ obj.getModelYearFrom() ~ '-' ~ obj.getModelYearTo() }}</small>
 									{% else %}
 										New Vehicle
 									{% endif %}
@@ -32,7 +32,7 @@
 							</div>
 						</div>
 					</div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ row is defined ? url('vehicle_update_submit', {'id': row.getId()}) : url('vehicle_create_submit') }}">
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('vehicle_update_submit', {'id': obj.getId()}) : url('vehicle_create_submit') }}">
 
 						<div class="m-portlet__body">
 							<div class="form-group m-form__group row no-border">
@@ -43,7 +43,7 @@
 									<select class="form-control m-input" id="manufacturer" name="manufacturer">
 										<option value=""></option>
 										{% for manufacturer in manufacturers %}
-											<option value="{{ manufacturer.getID() }}"{{ row is defined and manufacturer.getID() == row.getManufacturer().getID() ? ' selected' }}>{{ manufacturer.getName() }}</option>
+											<option value="{{ manufacturer.getID() }}"{{ obj.Manufacturer() and manufacturer.getID() == obj.getManufacturer().getID() ? ' selected' }}>{{ manufacturer.getName() }}</option>
 										{% endfor %}
 									</select>
 									<div class="form-control-feedback hide" data-field="manufacturer"></div>
@@ -54,7 +54,7 @@
 									Make:
 								</label>
 								<div class="col-lg-9">
-									<input type="text" name="make" class="form-control m-input">
+									<input type="text" name="make" class="form-control m-input" value="{{ obj.getMake() }}">
 									<div class="form-control-feedback hide" data-field="make"></div>
 								</div>
 							</div>
@@ -63,19 +63,19 @@
 									Year:
 								</label>
 								<div class="col-lg-9 flex-row">
-									<select class="form-control m-input" id="manufacturer" name="model_year_from">
+									<select class="form-control m-input" id="model_year_to" name="model_year_from">
 										<option value=""></option>
 										{% for year in years %}
-											<option value="{{ year }}"{{ row is defined and manufacturer.getModelYearFrom() == year ? ' selected' }}>{{ year }}</option>
+											<option value="{{ year }}"{{ obj.getModelYearFrom() == year ? ' selected' }}>{{ year }}</option>
 										{% endfor %}
 									</select>
 									<label class="col-form-label text-center">
 										to
 									</label>
-									<select class="form-control m-input" id="manufacturer" name="model_year_to">
+									<select class="form-control m-input" id="model_year_from" name="model_year_to">
 										<option value=""></option>
 										{% for year in years %}
-											<option value="{{ year }}"{{ row is defined and manufacturer.getModelYearTo() == year ? ' selected' }}>{{ year }}</option>
+											<option value="{{ year }}"{{ obj.getModelYearTo() == year ? ' selected' }}>{{ year }}</option>
 										{% endfor %}
 									</select>	
 								</div>