diff --git a/apps/api/app/admin/admin_users.rb b/apps/api/app/admin/admin_users.rb
index 1862178..088f479 100644
--- a/apps/api/app/admin/admin_users.rb
+++ b/apps/api/app/admin/admin_users.rb
@@ -1,4 +1,5 @@
 ActiveAdmin.register AdminUser do
+  menu priority: 8, label: "🔑 Admin Users"
   permit_params :email, :password, :password_confirmation, :member_id
 
   index do
diff --git a/apps/api/app/admin/downloads.rb b/apps/api/app/admin/downloads.rb
index ae86b4b..3f3a3ba 100644
--- a/apps/api/app/admin/downloads.rb
+++ b/apps/api/app/admin/downloads.rb
@@ -1,7 +1,7 @@
 ActiveAdmin.register Download do
   actions :index, :show
 
-  menu priority: 6, label: "Download Stats"
+  menu priority: 7, label: "📊 Download Stats"
 
   scope :all, default: true
   scope("Today")         { |scope| scope.where("downloads.created_at >= ?", Date.current.beginning_of_day) }
diff --git a/apps/api/app/admin/events.rb b/apps/api/app/admin/events.rb
index 5f91f01..dbd7ede 100644
--- a/apps/api/app/admin/events.rb
+++ b/apps/api/app/admin/events.rb
@@ -1,7 +1,7 @@
 ActiveAdmin.register Event do
   permit_params :name, :date
 
-  menu priority: 3
+  menu priority: 3, label: "📅 Events"
 
   scope :all, default: true
   scope("Upcoming") { |scope| scope.where("date >= ?", Time.current) }
diff --git a/apps/api/app/admin/files.rb b/apps/api/app/admin/files.rb
index 73561fc..afbb2c2 100644
--- a/apps/api/app/admin/files.rb
+++ b/apps/api/app/admin/files.rb
@@ -1,5 +1,5 @@
 ActiveAdmin.register_page "Files" do
-  menu priority: 6, label: "Files"
+  menu priority: 6, label: "📁 Files"
 
   content do
     service = FileManagerService.new
diff --git a/apps/api/app/admin/images.rb b/apps/api/app/admin/images.rb
index dddd6e9..6853f0b 100644
--- a/apps/api/app/admin/images.rb
+++ b/apps/api/app/admin/images.rb
@@ -1,7 +1,7 @@
 ActiveAdmin.register Image do
   permit_params :file_upload
 
-  menu priority: 5
+  menu priority: 5, label: "🖼️ Images"
 
   scope :all, default: true
   scope("In use") { |scope| scope.where(id: SoftwareImage.select(:image_id)).or(scope.where(id: Member.where.not(image_id: nil).select(:image_id))) }
diff --git a/apps/api/app/admin/members.rb b/apps/api/app/admin/members.rb
index 3a28b0a..dcd40f6 100644
--- a/apps/api/app/admin/members.rb
+++ b/apps/api/app/admin/members.rb
@@ -1,7 +1,7 @@
 ActiveAdmin.register Member do
   permit_params :nick, :real_nick, :motto, :avatar_filename, :image_id
 
-  menu priority: 4
+  menu priority: 4, label: "👥 Members"
 
   actions :all, except: [ :edit ]
 
diff --git a/apps/api/app/admin/softwares.rb b/apps/api/app/admin/softwares.rb
index bb493a6..a8274ba 100644
--- a/apps/api/app/admin/softwares.rb
+++ b/apps/api/app/admin/softwares.rb
@@ -5,7 +5,7 @@ ActiveAdmin.register Software do
                 external_links_attributes: [ :id, :label, :url, :_destroy ],
                 releases_attributes: [ :id, :version, :html_folder_path, :cartridge_path, :source_path, :docs_folder_path, :web_playable, :_destroy ]
 
-  menu priority: 2
+  menu priority: 2, label: "🎮 Softwares"
 
   actions :all, except: [ :edit ]
 
diff --git a/apps/api/config/initializers/active_admin.rb b/apps/api/config/initializers/active_admin.rb
index 33fd83f..7e562ff 100644
--- a/apps/api/config/initializers/active_admin.rb
+++ b/apps/api/config/initializers/active_admin.rb
@@ -20,15 +20,11 @@ ActiveAdmin.setup do |config|
                html_options: { target: "_blank", title: "Open site" },
                priority: 1
 
-      admin.add_logout_button_to_menu menu
-    end
-
-    admin.build_menu do |menu|
-      menu.add id: "go_to_site",
-               label: "🏠 Go to Site",
-               url: ENV.fetch("SITE_URL", "https://teletypegames.org"),
-               html_options: { target: "_blank" },
-               priority: 0
+      menu.add id: "logout",
+               label: "🚪 Logout",
+               url: :destroy_admin_user_session_path,
+               html_options: { method: :delete },
+               priority: 99
     end
   end
 end