diff --git a/lib/pages/common/custom_table.dart b/lib/pages/common/custom_table.dart
index 76ec2613..5308e450 100644
--- a/lib/pages/common/custom_table.dart
+++ b/lib/pages/common/custom_table.dart
@@ -196,6 +196,7 @@ class _DynamicTableState extends State<DynamicTable> {
               fontSize: 13,
               color: Color(0xFF999999),
             ),
+            maxLines: 2,
           ),
         ),
       ),
@@ -254,6 +255,7 @@ class _DynamicTableState extends State<DynamicTable> {
                       : statusColor,
               fontSize: 10,
               fontWeight: FontWeight.w400),
+          maxLines: 2,
         ),
       ),
     );
diff --git a/lib/pages/common/text_field/custom_text_field.dart b/lib/pages/common/text_field/custom_text_field.dart
index 587a1f4f..481102dc 100644
--- a/lib/pages/common/text_field/custom_text_field.dart
+++ b/lib/pages/common/text_field/custom_text_field.dart
@@ -15,7 +15,7 @@ class StatefulTextField extends StatefulWidget {
   final String hintText;
   final double width;
   final double elevation;
-  final TextEditingController controller; 
+  final TextEditingController controller;
 
   @override
   State<StatefulTextField> createState() => _StatefulTextFieldState();
@@ -26,7 +26,7 @@ class _StatefulTextFieldState extends State<StatefulTextField> {
   Widget build(BuildContext context) {
     return CustomTextField(
       title: widget.title,
-      controller: widget.controller, 
+      controller: widget.controller,
       hintText: widget.hintText,
       width: widget.width,
       elevation: widget.elevation,
@@ -69,6 +69,7 @@ class CustomTextField extends StatelessWidget {
           borderRadius: BorderRadius.circular(8),
           child: Container(
             width: width,
+            height: 45,
             decoration: BoxDecoration(
               color: Colors.white,
               borderRadius: BorderRadius.circular(8),
diff --git a/lib/pages/device_managment/all_devices/view/device_managment_page.dart b/lib/pages/device_managment/all_devices/view/device_managment_page.dart
index bc01871a..7496cf08 100644
--- a/lib/pages/device_managment/all_devices/view/device_managment_page.dart
+++ b/lib/pages/device_managment/all_devices/view/device_managment_page.dart
@@ -14,9 +14,11 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
     return BlocProvider(
       create: (context) => DeviceManagementBloc()..add(FetchDevices()),
       child: WebScaffold(
-        appBarTitle: Text(
-          'Device Management',
-          style: Theme.of(context).textTheme.headlineLarge,
+        appBarTitle: FittedBox(
+          child: Text(
+            'Device Management',
+            style: Theme.of(context).textTheme.headlineLarge,
+          ),
         ),
         appBarBody: const [
           NavigateHomeGridView(),
diff --git a/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart b/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart
index 383d6685..36ccf4f2 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart
@@ -76,7 +76,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                     const SizedBox(height: 12),
                     Container(
                       height: 43,
-                      width: isSmallScreenSize(context) ? double.infinity : 100,
+                      width: 100,
                       decoration: containerDecoration,
                       child: Center(
                         child: DefaultButton(