diff --git a/bl_pkg/bl_extension_ui.py b/bl_pkg/bl_extension_ui.py
index 0c6261e..9294b27 100644
--- a/bl_pkg/bl_extension_ui.py
+++ b/bl_pkg/bl_extension_ui.py
@@ -677,11 +677,11 @@ class USERPREF_MT_extensions_bl_pkg_settings(Menu):
         addon_prefs = context.preferences.addons[__package__].preferences
 
         layout.operator("bl_pkg.repo_sync_all", text="Check for Updates", icon='FILE_REFRESH')
-        layout.operator("bl_pkg.pkg_upgrade_all", text="Update All", icon='IMPORT')
+        layout.operator("bl_pkg.pkg_upgrade_all", text="Update All")
 
         layout.separator()
 
-        layout.operator("bl_pkg.pkg_install_files", icon='IMPORT', text="Install from Disk")
+        layout.operator("bl_pkg.pkg_install_files", icon='IMPORT', text="Install...")
         layout.operator("preferences.addon_install", text="Install Legacy Add-on")
 
         layout.separator()
@@ -728,17 +728,27 @@ def extensions_panel_draw(panel, context):
     wm = context.window_manager
     layout = panel.layout
 
-    row = layout.split(factor=0.5)
-    row_a = row.row()
-    row_a.prop(wm, "extension_search", text="", icon='VIEWZOOM')
-    row_b = row.row(align=True)
-    row_b.prop(wm, "extension_type", text="")
-    row_b.popover("USERPREF_PT_extensions_bl_pkg_filter", text="", icon='FILTER')
+    row = layout.split(factor=0.35)
+    row.operator("bl_pkg.repo_sync_all", text="Check for Updates", icon='FILE_REFRESH')
 
-    row_b.separator()
-    row_b.menu("USERPREF_MT_extensions_bl_pkg_settings", text="", icon='DOWNARROW_HLT')
-    row_b.popover("USERPREF_PT_extensions_repos", text="", icon='PREFERENCES')
-    del row, row_a, row_b
+    row = row.row()
+    row.operator("bl_pkg.pkg_upgrade_all", text="Update All")
+
+    row = row.row(align=True)
+    row.operator("bl_pkg.pkg_install_files", icon='IMPORT', text="Install...")
+    row.menu("USERPREF_MT_extensions_bl_pkg_settings", text="", icon='DOWNARROW_HLT')
+    row.separator()
+    row.popover("USERPREF_PT_extensions_repos")
+
+    row = layout.row()
+    row.separator()
+
+    row = layout.row(align=True)
+    row.prop(wm, "extension_search", text="", icon='VIEWZOOM')
+    row.prop(wm, "extension_type", text="")
+    row.popover("USERPREF_PT_extensions_bl_pkg_filter", text="", icon='FILTER')
+
+    del row
 
     if show_development_reports:
         show_status = bool(repo_status_text.log)