diff --git a/package_manager/__init__.py b/package_manager/__init__.py
index c0202be..308673c 100644
--- a/package_manager/__init__.py
+++ b/package_manager/__init__.py
@@ -674,10 +674,6 @@ class USERPREF_PT_packages(bpy.types.Panel):
                             PACKAGE_OT_uninstall.bl_idname,
                             text="Uninstall",
                             ).package_name=metapkg.name
-                    layout.operator(
-                            PACKAGE_OT_toggle_enabled.bl_idname,
-                            text="Disable" if pkg.enabled else "Enable",
-                            ).package_name=metapkg.name
                 else:
                     layout.operator(
                             PACKAGE_OT_install.bl_idname,
@@ -696,7 +692,6 @@ class USERPREF_PT_packages(bpy.types.Panel):
                 metacol = spl.column(align=True)
 
                 buttonrow = spl.row(align=True)
-                buttonrow.scale_y = 1.5
                 buttonrow.alignment = 'RIGHT'
 
                 l1 = metacol.row()
@@ -704,8 +699,13 @@ class USERPREF_PT_packages(bpy.types.Panel):
 
                 draw_operators(metapkg, buttonrow)
 
-                if pkg.installed and not pkg.enabled:
-                    metacol.enabled = False
+                if pkg.installed:
+                    metacol.active = pkg.enabled
+                    l1.operator(PACKAGE_OT_toggle_enabled.bl_idname,
+                              icon='CHECKBOX_HLT' if pkg.enabled else 'CHECKBOX_DEHLT',
+                              text="",
+                              emboss=False,
+                              ).package_name = metapkg.name
 
                 if pkg.name:
                     l1.label(text=pkg.name)
@@ -722,10 +722,16 @@ class USERPREF_PT_packages(bpy.types.Panel):
 
                 metacol = layoutbox.column(align=True)
                 row1 = layout.row(align=True)
+                row1.operator(PACKAGE_OT_toggle_enabled.bl_idname,
+                              icon='CHECKBOX_HLT' if pkg.enabled else 'CHECKBOX_DEHLT',
+                              text="",
+                              emboss=False,
+                              ).package_name = metapkg.name
                 row1.label(pkg.name)
 
                 if metapkg.installed:
-                    metacol.enabled = row1.enabled = pkg.enabled
+                    metacol.active = pkg.enabled
+                    row1.active = pkg.enabled
 
                 if pkg.description:
                     row = metacol.row()
@@ -759,7 +765,6 @@ class USERPREF_PT_packages(bpy.types.Panel):
 
                 spl = layoutbox.row().split(.35)
                 urlrow = spl.row()
-                urlrow.scale_y = 1.3
                 buttonrow = spl.row(align=True)
 
                 urlrow.alignment = 'LEFT'
@@ -769,7 +774,6 @@ class USERPREF_PT_packages(bpy.types.Panel):
                     urlrow.operator("wm.url_open", text="Report a Bug", icon='URL').url=pkg.tracker_url
 
                 buttonrow.alignment = 'RIGHT'
-                buttonrow.scale_y = 1.3
                 draw_operators(metapkg, buttonrow)
 
                 def draw_version(layout: bpy.types.UILayout, pkg: Package):
@@ -781,8 +785,8 @@ class USERPREF_PT_packages(bpy.types.Panel):
 
                     left.label(text=utils.fmt_version(pkg.version))
 
-                    if pkg.repository is not None:
-                        draw_metadatum("Repository", pkg.repository, left)
+                    for repo in pkg.repositories:
+                        draw_metadatum("Repository", repo.name, left)
 
                     if pkg.installed:
                         right.label(text="Installed")
diff --git a/package_manager/bpkg/types.py b/package_manager/bpkg/types.py
index c89ef77..23243b3 100644
--- a/package_manager/bpkg/types.py
+++ b/package_manager/bpkg/types.py
@@ -291,7 +291,7 @@ class ConsolidatedPackage:
                 pkg.repositories.union(newpkg.repositories)
                 if newpkg.installed:
                     pkg.set_installed_metadata(newpkg)
-                break
+                return
 
         self.versions.append(newpkg)
         self.versions.sort(key=lambda v: v.version, reverse=True)