diff --git a/src/Ramcar/ServiceType.php b/src/Ramcar/ServiceType.php
index 0eb92229..f349da21 100644
--- a/src/Ramcar/ServiceType.php
+++ b/src/Ramcar/ServiceType.php
@@ -4,13 +4,15 @@ namespace App\Ramcar;
 
 class ServiceType
 {
-    const BATTERY_REPLACEMENT       = 'battery';
-    const TIRE_REPAIR               = 'tire';
-    const OVERHEAT_ASSITANCE        = 'overheat';
-    const EMERGENCY_REFUEL          = 'fuel';
+    const BATTERY_REPLACEMENT_NEW       = 'battery_new';
+    const BATTERY_REPLACEMENT_WARRANTY  = 'battery_warranty';
+    const TIRE_REPAIR                   = 'tire';
+    const OVERHEAT_ASSITANCE            = 'overheat';
+    const EMERGENCY_REFUEL              = 'fuel';
 
     const COLLECTION = [
-        'battery' => 'Battery Replacement',
+        'battery_new' => 'Battery Replacement (New)',
+        'battery_warranty' => 'Battery Replacement (Under Warranty)',
         'tire' => 'Tire Repair',
         'overheat' => 'Overheat Assistance',
         'fuel' => 'Emergency Refuel',
diff --git a/templates/role/form.html.twig b/templates/role/form.html.twig
index 01e4e7ac..c5b2f519 100644
--- a/templates/role/form.html.twig
+++ b/templates/role/form.html.twig
@@ -13,7 +13,7 @@
     <div class="m-content">
         <!--Begin::Section-->
         <div class="row">
-            <div class="col-xl-4 offset-xl-4">
+            <div class="col-xl-8 offset-xl-2">
             	<div class="m-portlet m-portlet--mobile">
             		<div class="m-portlet__head">
 						<div class="m-portlet__head-caption">