diff --git a/b0esche_cloud/lib/pages/file_explorer.dart b/b0esche_cloud/lib/pages/file_explorer.dart
index bc4611f..bbd9385 100644
--- a/b0esche_cloud/lib/pages/file_explorer.dart
+++ b/b0esche_cloud/lib/pages/file_explorer.dart
@@ -798,32 +798,38 @@ class _FileExplorerState extends State<FileExplorer> {
                       return const SizedBox.shrink();
                     },
                   ),
-                  const SizedBox(height: 16),
-                  Row(
-                    children: [
-                      IconButton(
-                        icon: const Icon(
-                          Icons.arrow_back,
-                          color: AppTheme.primaryText,
-                        ),
-                        splashColor: Colors.transparent,
-                        highlightColor: Colors.transparent,
-                        onPressed: () {
-                          final parentPath = _getParentPath(state.currentPath);
-                          context.read<FileBrowserBloc>().add(
-                            LoadDirectory(
-                              orgId: widget.orgId,
-                              path: parentPath,
+                  // Only show back button and "Empty Folder" text if not at root
+                  if (state.currentPath != '/')
+                    Column(
+                      children: [
+                        const SizedBox(height: 16),
+                        Row(
+                          children: [
+                            IconButton(
+                              icon: const Icon(
+                                Icons.arrow_back,
+                                color: AppTheme.primaryText,
+                              ),
+                              splashColor: Colors.transparent,
+                              highlightColor: Colors.transparent,
+                              onPressed: () {
+                                final parentPath = _getParentPath(state.currentPath);
+                                context.read<FileBrowserBloc>().add(
+                                  LoadDirectory(
+                                    orgId: widget.orgId,
+                                    path: parentPath,
+                                  ),
+                                );
+                              },
                             ),
-                          );
-                        },
-                      ),
-                      const Text(
-                        'Empty Folder',
-                        style: TextStyle(color: AppTheme.primaryText),
-                      ),
-                    ],
-                  ),
+                            const Text(
+                              'Empty Folder',
+                              style: TextStyle(color: AppTheme.primaryText),
+                            ),
+                          ],
+                        ),
+                      ],
+                    ),
                 ],
               ),
             );
diff --git a/b0esche_cloud/lib/services/api_client.dart b/b0esche_cloud/lib/services/api_client.dart
index 2a66f89..7a5fae5 100644
--- a/b0esche_cloud/lib/services/api_client.dart
+++ b/b0esche_cloud/lib/services/api_client.dart
@@ -13,7 +13,7 @@ class ApiClient {
       BaseOptions(
         baseUrl: baseUrl,
         connectTimeout: const Duration(seconds: 10),
-        receiveTimeout: const Duration(seconds: 10),
+        receiveTimeout: const Duration(seconds: 60), // Increased for file uploads and org operations
       ),
     );