diff --git a/lib/pages/device_managment/two_gang_switch/view/wall_light_device_control.dart b/lib/pages/device_managment/two_gang_switch/view/wall_light_device_control.dart
index e72756eb..840d356e 100644
--- a/lib/pages/device_managment/two_gang_switch/view/wall_light_device_control.dart
+++ b/lib/pages/device_managment/two_gang_switch/view/wall_light_device_control.dart
@@ -35,51 +35,46 @@ class TwoGangDeviceControlView extends StatelessWidget
   }
 
   Widget _buildStatusControls(BuildContext context, TwoGangStatusModel status) {
-    final isExtraLarge = isExtraLargeScreenSize(context);
-    final isLarge = isLargeScreenSize(context);
-    final isMedium = isMediumScreenSize(context);
-    return GridView(
-      padding: const EdgeInsets.symmetric(horizontal: 50),
-      shrinkWrap: true,
-      physics: const NeverScrollableScrollPhysics(),
-      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount: isLarge || isExtraLarge
-            ? 3
-            : isMedium
-                ? 2
-                : 1,
-        mainAxisExtent: 140,
-        crossAxisSpacing: 12,
-        mainAxisSpacing: 12,
+    return Center(
+      child: Wrap(
+        alignment: WrapAlignment.center,
+        spacing: 12,
+        runSpacing: 12,
+        children: [
+          SizedBox(
+            width: 200,
+            child: ToggleWidget(
+              value: status.switch1,
+              code: 'switch_1',
+              deviceId: deviceId,
+              label: 'Wall Light',
+              onChange: (value) {
+                context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
+                      deviceId: deviceId,
+                      code: 'switch_1',
+                      value: value,
+                    ));
+              },
+            ),
+          ),
+          SizedBox(
+            width: 200,
+            child: ToggleWidget(
+              value: status.switch2,
+              code: 'switch_2',
+              deviceId: deviceId,
+              label: 'Ceiling Light',
+              onChange: (value) {
+                context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
+                      deviceId: deviceId,
+                      code: 'switch_2',
+                      value: value,
+                    ));
+              },
+            ),
+          ),
+        ],
       ),
-      children: [
-        ToggleWidget(
-          value: status.switch1,
-          code: 'switch_1',
-          deviceId: deviceId,
-          label: 'Wall Light',
-          onChange: (value) {
-            context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
-                  deviceId: deviceId,
-                  code: 'switch_1',
-                  value: value,
-                ));
-          },
-        ),
-        ToggleWidget(
-          value: status.switch2,
-          code: 'switch_2',
-          deviceId: deviceId,
-          label: 'Ceiling Light',
-          onChange: (value) {
-            context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
-                  deviceId: deviceId,
-                  code: 'switch_2',
-                  value: value,
-                ));
-          },
-        ),
-      ],
     );
   }
 }