diff --git a/Penumbra.GameData b/Penumbra.GameData
index 6a0daf2f..4a639dbe 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit 6a0daf2f309c27c5a260825bce31094987fce3d1
+Subproject commit 4a639dbeebc3cbbaf8518b7626892855689f7440
diff --git a/Penumbra/UI/ModsTab/ModPanelConflictsTab.cs b/Penumbra/UI/ModsTab/ModPanelConflictsTab.cs
index 7fd0ae77..926ba77b 100644
--- a/Penumbra/UI/ModsTab/ModPanelConflictsTab.cs
+++ b/Penumbra/UI/ModsTab/ModPanelConflictsTab.cs
@@ -1,6 +1,10 @@
+using Dalamud.Interface;
+using Dalamud.Interface.Utility;
 using ImGuiNET;
+using OtterGui;
 using OtterGui.Raii;
 using OtterGui.Widgets;
+using Penumbra.Collections.Cache;
 using Penumbra.Collections.Manager;
 using Penumbra.Meta.Manipulations;
 using Penumbra.Mods;
@@ -20,60 +24,182 @@ public class ModPanelConflictsTab : ITab
         _selector          = selector;
     }
 
+    private int? _currentPriority = null;
+
     public ReadOnlySpan<byte> Label
         => "Conflicts"u8;
 
     public bool IsVisible
         => _collectionManager.Active.Current.Conflicts(_selector.Selected!).Count > 0;
 
+    private readonly ConditionalWeakTable<IMod, object> _expandedMods = new();
+
+    private int GetPriority(ModConflicts conflicts)
+    {
+        if (conflicts.Mod2.Index < 0)
+            return conflicts.Mod2.Priority;
+
+        return _collectionManager.Active.Current[conflicts.Mod2.Index].Settings?.Priority ?? 0;
+    }
+
     public void DrawContent()
     {
-        using var box = ImRaii.ListBox("##conflicts", -Vector2.One);
-        if (!box)
+        using var table = ImRaii.Table("conflicts", 3, ImGuiTableFlags.RowBg | ImGuiTableFlags.ScrollY, ImGui.GetContentRegionAvail());
+        if (!table)
             return;
 
+        var       buttonSize       = new Vector2(ImGui.GetFrameHeight());
+        var       spacing          = ImGui.GetStyle().ItemInnerSpacing with { Y = ImGui.GetStyle().ItemSpacing.Y };
+        var       priorityRowWidth = ImGui.CalcTextSize("Priority").X + 20 * ImGuiHelpers.GlobalScale + 2 * buttonSize.X;
+        var       priorityWidth    = priorityRowWidth - 2 * (buttonSize.X + spacing.X);
+        using var style            = ImRaii.PushStyle(ImGuiStyleVar.ItemSpacing, spacing);
+        ImGui.TableSetupColumn("Conflicting Mod", ImGuiTableColumnFlags.WidthStretch);
+        ImGui.TableSetupColumn("Priority",        ImGuiTableColumnFlags.WidthFixed, priorityRowWidth);
+        ImGui.TableSetupColumn("Files",           ImGuiTableColumnFlags.WidthFixed, ImGui.CalcTextSize("Files").X + spacing.X);
+
+        ImGui.TableSetupScrollFreeze(2, 2);
+        ImGui.TableHeadersRow();
+        DrawCurrentRow(priorityWidth);
+
         // Can not be null because otherwise the tab bar is never drawn.
         var mod = _selector.Selected!;
-        foreach (var conflict in _collectionManager.Active.Current.Conflicts(mod))
+        foreach (var (conflict, index) in _collectionManager.Active.Current.Conflicts(mod).OrderByDescending(GetPriority)
+                     .ThenBy(c => c.Mod2.Name.Lower).WithIndex())
         {
-            if (ImGui.Selectable(conflict.Mod2.Name) && conflict.Mod2 is Mod otherMod)
-                _selector.SelectByValue(otherMod);
-            var hovered      = ImGui.IsItemHovered();
-            var rightClicked = ImGui.IsItemClicked(ImGuiMouseButton.Right);
-
-            ImGui.SameLine();
-            using (var color = ImRaii.PushColor(ImGuiCol.Text,
-                       conflict.HasPriority ? ColorId.HandledConflictMod.Value() : ColorId.ConflictingMod.Value()))
-            {
-                var priority = conflict.Mod2.Index < 0
-                    ? conflict.Mod2.Priority
-                    : _collectionManager.Active.Current[conflict.Mod2.Index].Settings!.Priority;
-                ImGui.TextUnformatted($"(Priority {priority})");
-                hovered      |= ImGui.IsItemHovered();
-                rightClicked |= ImGui.IsItemClicked(ImGuiMouseButton.Right);
-            }
-
-            if (conflict.Mod2 is Mod otherMod2)
-            {
-                if (hovered)
-                    ImGui.SetTooltip("Click to jump to mod, Control + Right-Click to disable mod.");
-                if (rightClicked && ImGui.GetIO().KeyCtrl)
-                    _collectionManager.Editor.SetModState(_collectionManager.Active.Current, otherMod2, false);
-            }
-
-            using var indent = ImRaii.PushIndent(30f);
-            foreach (var data in conflict.Conflicts)
-            {
-                unsafe
-                {
-                    var _ = data switch
-                    {
-                        Utf8GamePath p     => ImGuiNative.igSelectable_Bool(p.Path.Path, 0, ImGuiSelectableFlags.None, Vector2.Zero) > 0,
-                        MetaManipulation m => ImGui.Selectable(m.Manipulation?.ToString() ?? string.Empty),
-                        _                  => false,
-                    };
-                }
-            }
+            using var id = ImRaii.PushId(index);
+            DrawConflictRow(conflict, priorityWidth, buttonSize);
         }
     }
+
+    private void DrawCurrentRow(float priorityWidth)
+    {
+        ImGui.TableNextColumn();
+        using var c = ImRaii.PushColor(ImGuiCol.Text, ColorId.FolderLine.Value());
+        ImGui.AlignTextToFramePadding();
+        ImGui.TextUnformatted(_selector.Selected!.Name);
+        ImGui.TableNextColumn();
+        var priority = _collectionManager.Active.Current[_selector.Selected!.Index].Settings!.Priority;
+        ImGui.SetNextItemWidth(priorityWidth);
+        if (ImGui.InputInt("##priority", ref priority, 0, 0, ImGuiInputTextFlags.EnterReturnsTrue))
+            _currentPriority = priority;
+
+        if (ImGui.IsItemDeactivatedAfterEdit() && _currentPriority.HasValue)
+        {
+            if (_currentPriority != _collectionManager.Active.Current[_selector.Selected!.Index].Settings!.Priority)
+                _collectionManager.Editor.SetModPriority(_collectionManager.Active.Current, (Mod)_selector.Selected!,
+                    _currentPriority.Value);
+
+            _currentPriority = null;
+        }
+        else if (ImGui.IsItemDeactivated())
+        {
+            _currentPriority = null;
+        }
+
+        ImGui.TableNextColumn();
+    }
+
+    private void DrawConflictSelectable(ModConflicts conflict)
+    {
+        ImGui.AlignTextToFramePadding();
+        if (ImGui.Selectable(conflict.Mod2.Name) && conflict.Mod2 is Mod otherMod)
+            _selector.SelectByValue(otherMod);
+        var hovered      = ImGui.IsItemHovered();
+        var rightClicked = ImGui.IsItemClicked(ImGuiMouseButton.Right);
+        if (conflict.Mod2 is Mod otherMod2)
+        {
+            if (hovered)
+                ImGui.SetTooltip("Click to jump to mod, Control + Right-Click to disable mod.");
+            if (rightClicked && ImGui.GetIO().KeyCtrl)
+                _collectionManager.Editor.SetModState(_collectionManager.Active.Current, otherMod2, false);
+        }
+    }
+
+    private bool DrawExpandedFiles(ModConflicts conflict)
+    {
+        if (!_expandedMods.TryGetValue(conflict.Mod2, out _))
+            return false;
+
+        using var indent = ImRaii.PushIndent(30f);
+        foreach (var data in conflict.Conflicts)
+        {
+            unsafe
+            {
+                var _ = data switch
+                {
+                    Utf8GamePath p     => ImGuiNative.igSelectable_Bool(p.Path.Path, 0, ImGuiSelectableFlags.None, Vector2.Zero) > 0,
+                    MetaManipulation m => ImGui.Selectable(m.Manipulation?.ToString() ?? string.Empty),
+                    _                  => false,
+                };
+            }
+        }
+
+        return true;
+    }
+
+    private void DrawConflictRow(ModConflicts conflict, float priorityWidth, Vector2 buttonSize)
+    {
+        ImGui.TableNextColumn();
+        DrawConflictSelectable(conflict);
+        var expanded = DrawExpandedFiles(conflict);
+        ImGui.TableNextColumn();
+        var conflictPriority = DrawPriorityInput(conflict, priorityWidth);
+        ImGui.SameLine();
+        var selectedPriority = _collectionManager.Active.Current[_selector.Selected!.Index].Settings!.Priority;
+        DrawPriorityButtons(conflict.Mod2 as Mod, conflictPriority, selectedPriority, buttonSize);
+        ImGui.TableNextColumn();
+        DrawExpandButton(conflict.Mod2, expanded, buttonSize);
+    }
+
+    private void DrawExpandButton(IMod mod, bool expanded, Vector2 buttonSize)
+    {
+        var (icon, tt) = expanded
+            ? (FontAwesomeIcon.CaretUp.ToIconString(), "Hide the conflicting files for this mod.")
+            : (FontAwesomeIcon.CaretDown.ToIconString(), "Show the conflicting files for this mod.");
+        if (ImGuiUtil.DrawDisabledButton(icon, buttonSize, tt, false, true))
+        {
+            if (expanded)
+                _expandedMods.Remove(mod);
+            else
+                _expandedMods.Add(mod, new object());
+        }
+    }
+
+    private int DrawPriorityInput(ModConflicts conflict, float priorityWidth)
+    {
+        using var color = ImRaii.PushColor(ImGuiCol.Text,
+            conflict.HasPriority ? ColorId.HandledConflictMod.Value() : ColorId.ConflictingMod.Value());
+        using var disabled = ImRaii.Disabled(conflict.Mod2.Index < 0);
+        var       priority = _currentPriority ?? GetPriority(conflict);
+
+        ImGui.SetNextItemWidth(priorityWidth);
+        if (ImGui.InputInt("##priority", ref priority, 0, 0, ImGuiInputTextFlags.EnterReturnsTrue))
+            _currentPriority = priority;
+
+        if (ImGui.IsItemDeactivatedAfterEdit() && _currentPriority.HasValue)
+        {
+            if (_currentPriority != GetPriority(conflict))
+                _collectionManager.Editor.SetModPriority(_collectionManager.Active.Current, (Mod)conflict.Mod2, _currentPriority.Value);
+
+            _currentPriority = null;
+        }
+        else if (ImGui.IsItemDeactivated())
+        {
+            _currentPriority = null;
+        }
+
+        return priority;
+    }
+
+    private void DrawPriorityButtons(Mod? conflict, int conflictPriority, int selectedPriority, Vector2 buttonSize)
+    {
+        if (ImGuiUtil.DrawDisabledButton(FontAwesomeIcon.SortNumericUpAlt.ToIconString(), buttonSize,
+                $"Set the priority of the currently selected mod to this mods priority plus one. ({selectedPriority} -> {conflictPriority + 1})", selectedPriority > conflictPriority, true))
+            _collectionManager.Editor.SetModPriority(_collectionManager.Active.Current, _selector.Selected!, conflictPriority + 1);
+        ImGui.SameLine();
+        if (ImGuiUtil.DrawDisabledButton(FontAwesomeIcon.SortNumericDownAlt.ToIconString(), buttonSize,
+                $"Set the priority of this mod to the currently selected mods priority minus one. ({conflictPriority} -> {selectedPriority - 1})",
+                selectedPriority > conflictPriority || conflict == null, true))
+            _collectionManager.Editor.SetModPriority(_collectionManager.Active.Current, conflict!, selectedPriority - 1);
+    }
 }