diff --git a/lib/management/views/management_screen.dart b/lib/management/views/management_screen.dart
index 6388be5a..7c1af4d7 100755
--- a/lib/management/views/management_screen.dart
+++ b/lib/management/views/management_screen.dart
@@ -27,8 +27,8 @@ class _CapabilityForm extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Wrap(
-      spacing: 4.0,
-      runSpacing: 8.0,
+      spacing: 8,
+      runSpacing: 16,
       children: Capability.values
           .where((c) => capabilities & c.value != 0)
           .map((c) => FilterChip(
@@ -85,30 +85,41 @@ class _CapabilitiesForm extends StatelessWidget {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        if (usbCapabilities != 0)
+        if (usbCapabilities != 0) ...[
           const ListTile(
             leading: Icon(Icons.usb),
-            title: Text('USB applications'),
+            title: Text('USB'),
+            contentPadding: EdgeInsets.only(bottom: 8),
+            horizontalTitleGap: 0,
           ),
-        _CapabilityForm(
-          capabilities: usbCapabilities,
-          enabled: enabled[Transport.usb] ?? 0,
-          onChanged: (value) {
-            onChanged({...enabled, Transport.usb: value});
-          },
-        ),
-        if (nfcCapabilities != 0)
+          _CapabilityForm(
+            capabilities: usbCapabilities,
+            enabled: enabled[Transport.usb] ?? 0,
+            onChanged: (value) {
+              onChanged({...enabled, Transport.usb: value});
+            },
+          ),
+        ],
+        if (nfcCapabilities != 0) ...[
+          if (usbCapabilities != 0)
+            const Padding(
+              padding: EdgeInsets.only(top: 24, bottom: 12),
+              child: Divider(),
+            ),
           const ListTile(
             leading: Icon(Icons.wifi),
-            title: Text('NFC applications'),
+            title: Text('NFC'),
+            contentPadding: EdgeInsets.only(bottom: 8),
+            horizontalTitleGap: 0,
           ),
-        _CapabilityForm(
-          capabilities: nfcCapabilities,
-          enabled: enabled[Transport.nfc] ?? 0,
-          onChanged: (value) {
-            onChanged({...enabled, Transport.nfc: value});
-          },
-        ),
+          _CapabilityForm(
+            capabilities: nfcCapabilities,
+            enabled: enabled[Transport.nfc] ?? 0,
+            onChanged: (value) {
+              onChanged({...enabled, Transport.nfc: value});
+            },
+          ),
+        ]
       ],
     );
   }