diff --git a/lib/dashboard_latest/widgets/app_bar_widget.dart b/lib/dashboard_latest/widgets/app_bar_widget.dart
index a08a9809..8dcc73b2 100644
--- a/lib/dashboard_latest/widgets/app_bar_widget.dart
+++ b/lib/dashboard_latest/widgets/app_bar_widget.dart
@@ -142,18 +142,19 @@ class _AppBarWidgetState extends State<AppBarWidget> with TickerProviderStateMix
                     children: [
                       Text(
                         snapshot.user?.username ?? "",
+                        maxLines: 2,
                         style: AppTextStyles.heading6.copyWith(color: AppColor.headingTextColor(context), fontSize: context.isTablet() ? 14 : null),
                       ),
-                      Text(
-                        snapshot.user?.roleName ?? "",
-                        style: AppTextStyles.bodyText.copyWith(color: AppColor.lightTextColor(context), fontSize: context.isTablet() ? 12 : null),
-                      ),
+                      // Text(
+                      //   snapshot.user?.roleName ?? "",
+                      //   style: AppTextStyles.bodyText.copyWith(color: AppColor.lightTextColor(context), fontSize: context.isTablet() ? 12 : null),
+                      // ),
                     ],
                   ),
                 ),
               ),
             ),
-            const Spacer(),
+            // const Spacer(),
             // Action icons with right-to-left fade animation
             SlideTransition(
               position: _rightSlideAnimation,
diff --git a/lib/modules/tm_module/device_transfer/device_filter_screen.dart b/lib/modules/tm_module/device_transfer/device_filter_screen.dart
index 04802a5e..9540c5d8 100644
--- a/lib/modules/tm_module/device_transfer/device_filter_screen.dart
+++ b/lib/modules/tm_module/device_transfer/device_filter_screen.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
+import 'package:test_sa/controllers/api_routes/api_manager.dart';
+import 'package:test_sa/controllers/api_routes/urls.dart';
 import 'package:test_sa/controllers/providers/api/devices_provider.dart';
 import 'package:test_sa/extensions/context_extension.dart';
 import 'package:test_sa/extensions/int_extensions.dart';
@@ -117,14 +119,15 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
           ListView(
             padding: const EdgeInsets.all(16),
             children: [
-              AssetStatusButtons(
-                initialValue: _commissioningStatus,
-                onSelect: (value) {
-                  if (value != null) {
-                    _commissioningStatus = value;
-                  }
-                },
-              ),
+              // AssetStatusButtons(
+              //   initialValue: _commissioningStatus,
+              //   onSelect: (value) {
+              //     if (value != null) {
+              //       _commissioningStatus = value;
+              //     }
+              //   },
+              // ),
+              context.translation.filter.heading5(context).custom(color: AppColor.textStyleColor(context)),
               16.height,
               MultipleItemDropDownMenu<Lookup, DepartmentProvider>(
                 context: context,