diff --git a/config/menu.yaml b/config/menu.yaml
index 9f28b315..b0096cf5 100644
--- a/config/menu.yaml
+++ b/config/menu.yaml
@@ -37,10 +37,6 @@ main_menu:
       acl: rider.list
       label: Riders
       parent: logistics
-    - id: service_charge_list
-      acl: service_charge.list
-      label: Service Charges
-      parent: logistics
 
     - id: battery
       acl: battery.menu
@@ -102,13 +98,21 @@ main_menu:
       acl: joborder.menu
       label: Job Order
       icon: flaticon-calendar-3
-    - id: jo_onestep_form
-      acl: jo_onestep.form
-      label: One-step Process
+    - id: jo_in
+      acl: jo_in.list
+      label: Incoming
       parent: joborder
-    - id: jo_walkin_form
-      acl: jo_walkin.form
-      label: Walk-in
+    - id: jo_proc
+      acl: jo_proc.list
+      label: Dispatch
+      parent: joborder
+    - id: jo_assign
+      acl: jo_assign.list
+      label: Rider Assignment
+      parent: joborder
+    - id: jo_fulfill
+      acl: jo_fulfill.list
+      label: Fulfillment
       parent: joborder
     - id: jo_open
       acl: jo_open.list
diff --git a/config/services.yaml b/config/services.yaml
index 8fe325e4..1756cf98 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -157,62 +157,41 @@ services:
         tags:
             - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
 
-    # CMB invoice generator
-    App\Service\InvoiceGenerator\CMBInvoiceGenerator: ~
-
-    # Resq invoice generator
-    #App\Service\InvoiceGenerator\ResqInvoiceGenerator: ~
+    # invoice generator
+    App\Service\InvoiceGenerator\ResqInvoiceGenerator: ~
 
     # invoice generator interface
-    App\Service\InvoiceGeneratorInterface: "@App\\Service\\InvoiceGenerator\\CMBInvoiceGenerator"
-    #App\Service\InvoiceGeneratorInterface: "@App\\Service\\InvoiceGenerator\\ResqInvoiceGenerator"
+    App\Service\InvoiceGeneratorInterface: "@App\\Service\\InvoiceGenerator\\ResqInvoiceGenerator"
 
-    # Resq job order generator
-    #App\Service\JobOrderHandler\ResqJobOrderHandler:
-    #    arguments:
-    #        $country_code: "%env(COUNTRY_CODE)%" 
-
-    # CMB job order generator
-    App\Service\JobOrderHandler\CMBJobOrderHandler:
+    # job order generator
+    App\Service\JobOrderHandler\ResqJobOrderHandler:
         arguments:
-            $country_code: "%env(COUNTRY_CODE)%"
+            $country_code: "%env(COUNTRY_CODE)%" 
 
     #job order generator interface
-    App\Service\JobOrderHandlerInterface: "@App\\Service\\JobOrderHandler\\CMBJobOrderHandler"
-    #App\Service\JobOrderHandlerInterface: "@App\\Service\\JobOrderHandler\\ResqJobOrderHandler"
+    App\Service\JobOrderHandlerInterface: "@App\\Service\\JobOrderHandler\\ResqJobOrderHandler"
 
-    # CMB customer generator
-    App\Service\CustomerHandler\CMBCustomerHandler:
-        arguments:
-           $country_code: "%env(COUNTRY_CODE)%"
-
-    # Resq customer generator
-    #App\Service\CustomerHandler\ResqCustomerHandler:
-    #    arguments:
-    #        $country_code: "%env(COUNTRY_CODE)%"
-
-    # customer generator interface
-    App\Service\CustomerHandlerInterface: "@App\\Service\\CustomerHandler\\CMBCustomerHandler"
-    #App\Service\CustomerHandlerInterface: "@App\\Service\\CustomerHandler\\ResqCustomerHandler"
-
-    # rider assignment 
-    #App\Service\RiderAssignmentHandler\CMBRiderAssignmentHandler: ~
-
-    # rider assignment interface
-    App\Service\RiderAssignmentHandlerInterface: "@App\\Service\\RiderAssignmentHandler\\CMBRiderAssignmentHandler"
-
-    # rider API service
-    App\Service\RiderAPIHandler\CMBRiderAPIHandler:
+    # customer generator
+    App\Service\CustomerHandler\ResqCustomerHandler:
         arguments:
             $country_code: "%env(COUNTRY_CODE)%"
 
-    #App\Service\RiderAPIHandler\ResqRiderAPIHandler: 
-    #    arguments:
-    #        $country_code: "%env(COUNTRY_CODE)%" 
+    # customer generator interface
+    App\Service\CustomerHandlerInterface: "@App\\Service\\CustomerHandler\\ResqCustomerHandler"
 
-    # rider API interface
-    App\Service\RiderAPIHandlerInterface: "@App\\Service\\RiderAPIHandler\\CMBRiderAPIHandler"
+    # rider assignment 
+    App\Service\RiderAssignmentHandler\ResqRiderAssignmentHandler: ~
 
+    # rider assignment interface
+    App\Service\RiderAssignmentHandlerInterface: "@App\\Service\\RiderAssignmentHandler\\ResqRiderAssignmentHandler"
+
+    # rider API service
+    App\Service\RiderAPIHandler\ResqRiderAPIHandler: 
+        arguments:
+            $country_code: "%env(COUNTRY_CODE)%" 
+
+    App\Service\RiderAPIHandlerInterface: "@App\\Service\\RiderAPIHandler\\ResqRiderAPIHandler"
+    
     # map manager
     #App\Service\GISManager\Bing: ~
     App\Service\GISManager\OpenStreet: ~
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index 3e12543b..c0fb8ca1 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -1,27 +1,27 @@
 # text
-title_login: Res-Q for CMB | Login
-block_title: Res-Q for CMB
+title_login: Motolite Res-Q | Login
+block_title: Motolite Res-Q
 control_panel_sign_in: Sign-in to Control Panel
-alt_image_logo_login: Res-Q for CMB
-alt_image_dashboard: Res-Q for CMB
-copyright: Res-Q for CMB
+alt_image_logo_login: Res-Q
+alt_image_dashboard: Motolite
+copyright: Motolite Res-Q
 battery_size_tradein_brand: Trade-in Motolite
 battery_size_tradein_premium: Trade-in Premium
 battery_size_tradein_other: Trade-in Other
 add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
-jo_title_pdf: Res-Q for CMB Job Order
-country_code_prefix: '+60'
-delivery_instructions_label: 'CarFix Details'
+jo_title_pdf: Motolite Res-Q Job Order
+country_code_prefix: '+63'
+delivery_instructions_label: Delivery Instructions
 
 # images
-image_logo_login: /assets/images/black-text-logo-01.png
-icon_login: /assets/images/battery-assist-bm-logo-32x32.png
-icon_base_32x32: /assets/images/black-text-logo-01-32x32.png
-icon_base_16x16: /assets/images/black-text-logo-01-16x16.png
-image_dashboard: /assets/images/century_logo.png
-image_jo_pdf: /public/assets/images/black-text-logo-01-115x115.png
+image_logo_login: /assets/images/logo-resq.png
+icon_login: /assets/demo/default/media/img/logo/favicon.ico
+icon_base_32x32: /assets/images/favicon/favicon-32x32.png
+icon_base_16x16: /assets/images/favicon/favicon-16x16.png 
+image_dashboard: /assets/images/logo-motolite.png
+image_jo_pdf: /public/assets/images/logo-resq.png
 
 # default point for maps
-default_lat: 3.084216
-default_long: 101.6129996
-default_region: my 
+default_lat: 14.6091
+default_long: 121.0223
+default_region: ph