Restructure menu and acl for battery and vehicle screens

config/acl.yaml

@@ -127,4 +127,4 @@ access_keys:
         - id: customer.update
           label: Update
         - id: customer.delete
-          label: Delete
+          label: Delete

config/menu.yaml

@@ -20,31 +20,42 @@ main_menu:
       acl: database.menu
       label: Database
       icon: flaticon-tabs
+
+    - id: battery
+      acl: battery.menu
+      label: Battery
+      icon: fa fa-battery-3
     - id: battery_list
       acl: battery.list
       label: Batteries
-      parent: database
+      parent: battery
     - id: bmfg_list
       acl: bmfg.list
-      label: Battery Manufacturers
-      parent: database
+      label: Manufacturers
+      parent: battery
     - id: bmodel_list
       acl: bmodel.list
-      label: Battery Models
-      parent: database
+      label: Models
+      parent: battery
     - id: bsize_list
       acl: bsize.list
-      label: Battery Sizes
-      parent: database
+      label: Sizes
+      parent: battery
+
+    - id: vehicle
+      acl: vehicle.menu
+      label: Vehicle
+      icon: fa fa-car
     - id: vehicle_list
       acl: vehicle.list
       label: Vehicles
-      parent: database
+      parent: vehicle
     - id: vmfg_list
       acl: vmfg.list
-      label: Vehicle Manufacturers
-      parent: database
+      label: Manufacturers
+      parent: vehicle
+
     - id: customer_list
       acl: customer.list
       label: Customers
-      parent: database
+      parent: database