diff --git a/b0esche_cloud/lib/pages/home_page.dart b/b0esche_cloud/lib/pages/home_page.dart
index 3bdc19b..3b1fd1c 100644
--- a/b0esche_cloud/lib/pages/home_page.dart
+++ b/b0esche_cloud/lib/pages/home_page.dart
@@ -123,21 +123,30 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
       builder: (context, state) {
         if (state is OrganizationLoaded) {
           final orgs = state.organizations;
-          return Row(
+          return Column(
             children: [
-              ...orgs.map(
-                (org) => Row(
-                  children: [
-                    _buildOrgButton(org, org.id == state.selectedOrg?.id, () {
-                      context.read<OrganizationBloc>().add(
-                        SelectOrganization(org.id),
-                      );
-                    }),
-                    const SizedBox(width: 16),
-                  ],
-                ),
+              Row(
+                children: [
+                  ...orgs.map(
+                    (org) => Row(
+                      children: [
+                        _buildOrgButton(
+                          org,
+                          org.id == state.selectedOrg?.id,
+                          () {
+                            context.read<OrganizationBloc>().add(
+                              SelectOrganization(org.id),
+                            );
+                          },
+                        ),
+                        const SizedBox(width: 16),
+                      ],
+                    ),
+                  ),
+                  _buildAddButton(() => _showCreateOrgDialog(context)),
+                ],
               ),
-              _buildAddButton(() => _showCreateOrgDialog(context)),
+              const Divider(height: 1),
             ],
           );
         } else {
@@ -288,7 +297,6 @@ class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
                                               children: [
                                                 const SizedBox(height: 8),
                                                 _buildOrgRow(context),
-                                                const Divider(height: 1),
                                                 Expanded(
                                                   child: _buildDrive(orgState),
                                                 ),