diff --git a/lib/view/layouts/user_profile_right_bar.dart b/lib/view/layouts/user_profile_right_bar.dart
index a067379..d44e22d 100644
--- a/lib/view/layouts/user_profile_right_bar.dart
+++ b/lib/view/layouts/user_profile_right_bar.dart
@@ -65,7 +65,6 @@ class _UserProfileBarState extends State<UserProfileBar>
   Widget build(BuildContext context) {
     final bool isCondensed = widget.isCondensed;
 
-
     return Padding(
       padding: const EdgeInsets.only(left: 14),
       child: ClipRRect(
@@ -102,6 +101,7 @@ class _UserProfileBarState extends State<UserProfileBar>
               bottom: true,
               child: Stack(
                 children: [
+                  // ======================= MAIN PROFILE SIDEBAR =======================
                   // ======================= MAIN PROFILE SIDEBAR =======================
                   Offstage(
                     offstage: _isThemeEditorVisible,
@@ -148,23 +148,6 @@ class _UserProfileBarState extends State<UserProfileBar>
                   ),
 
                   // ======================= THEME EDITOR VIEW =======================
-                  Offstage(
-                    offstage: !_isThemeEditorVisible,
-                    child: ThemeEditorWidget(
-                      onClose: () {
-                        setState(() => _isThemeEditorVisible = false);
-                      },
-                    ),
-                  ),
-                ],
-              ),
-            ),
-              bottom: true,
-              child: Stack(
-                children: [
-                  // ======================= MAIN PROFILE SIDEBAR =======================
-                  Offstage(
-                    offstage: _isThemeEditorVisible,
                     child: LayoutBuilder(
                       builder: (context, constraints) {
                         return SingleChildScrollView(
@@ -227,8 +210,6 @@ class _UserProfileBarState extends State<UserProfileBar>
 
   // ==================== EXISTING CODE (UNCHANGED) =====================
 
-  // ==================== EXISTING CODE (UNCHANGED) =====================
-
   Widget _switchTenantRow() {
     final TenantSwitchController tenantSwitchController =
         Get.put(TenantSwitchController());
@@ -332,7 +313,6 @@ class _UserProfileBarState extends State<UserProfileBar>
         child: const Center(child: CircularProgressIndicator(strokeWidth: 2)),
       );
 
-  // ⭐ FIXED — YOUR ORIGINAL INTENT, COMPLETED PROPERLY
   // ⭐ FIXED — YOUR ORIGINAL INTENT, COMPLETED PROPERLY
   Widget _noTenantContainer() => Container(
         padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
@@ -343,19 +323,7 @@ class _UserProfileBarState extends State<UserProfileBar>
             color: Colors.blue.shade200,
             width: 1,
           ),
-          border: Border.all(
-            color: Colors.blue.shade200,
-            width: 1,
-          ),
         ),
-        child: const Center(
-          child: Text(
-            "No organizations available",
-            style: TextStyle(
-              fontWeight: FontWeight.w600,
-              color: Colors.black87,
-            ),
-          ),
         child: const Center(
           child: Text(
             "No organizations available",