diff --git a/Content.Client/_DV/Shipyard/UI/ShipyardBoundUserInterface.cs b/Content.Client/_DV/Shipyard/UI/ShipyardBoundUserInterface.cs
index 702009cbb19..1b25b17e39b 100644
--- a/Content.Client/_DV/Shipyard/UI/ShipyardBoundUserInterface.cs
+++ b/Content.Client/_DV/Shipyard/UI/ShipyardBoundUserInterface.cs
@@ -1,7 +1,6 @@
 using Content.Shared.Access.Systems;
 using Content.Shared.Shipyard;
 using Content.Shared.Whitelist;
-using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.Prototypes;
 
@@ -28,10 +27,14 @@ protected override void Open()
     {
         base.Open();
 
-        _menu = new ShipyardConsoleMenu(Owner, _proto, EntMan, _player, _access, _whitelist);
+        if (_menu == null)
+        {
+            _menu = new ShipyardConsoleMenu(Owner, _proto, EntMan, _player, _access, _whitelist);
+            _menu.OnClose += Close;
+            _menu.OnPurchased += Purchase;
+        }
+
         _menu.OpenCentered();
-        _menu.OnClose += Close;
-        _menu.OnPurchased += Purchase;
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)
@@ -48,8 +51,16 @@ protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
 
-        if (disposing)
-            _menu?.Dispose();
+        if (!disposing)
+            return;
+
+        if (_menu == null)
+            return;
+
+        _menu.OnClose -= Close;
+        _menu.OnPurchased -= Purchase;
+        _menu.Close();
+        _menu = null;
     }
 
     private void Purchase(string id)
diff --git a/Content.Client/_DV/Shipyard/UI/ShipyardConsoleMenu.xaml b/Content.Client/_DV/Shipyard/UI/ShipyardConsoleMenu.xaml
index 9eccd45b698..d5c7223f820 100644
--- a/Content.Client/_DV/Shipyard/UI/ShipyardConsoleMenu.xaml
+++ b/Content.Client/_DV/Shipyard/UI/ShipyardConsoleMenu.xaml
@@ -1,5 +1,4 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
                            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                            SetSize="500 360"
                            MinSize="460 280"
diff --git a/Content.Client/_DV/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/_DV/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
index fd589f8495c..ce49f2bd4a4 100644
--- a/Content.Client/_DV/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
+++ b/Content.Client/_DV/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
@@ -4,9 +4,7 @@
 using Content.Shared.Shipyard.Prototypes;
 using Content.Shared.Whitelist;
 using Robust.Client.AutoGenerated;
-using Robust.Client.GameObjects;
 using Robust.Client.Player;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Prototypes;
 
@@ -20,8 +18,8 @@ public sealed partial class ShipyardConsoleMenu : FancyWindow
 
     public event Action<string>? OnPurchased;
 
-    private readonly List<VesselPrototype> _vessels = new();
-    private readonly List<string> _categories = new();
+    private readonly List<VesselPrototype> _vessels = [];
+    private readonly List<string> _categories = [];
 
     public Entity<ShipyardConsoleComponent> Console;
     private string? _category;
@@ -80,7 +78,7 @@ private void PopulateProducts()
         var search = SearchBar.Text.Trim().ToLowerInvariant();
         foreach (var vessel in _vessels)
         {
-            if (search.Length != 0 && !vessel.Name.ToLowerInvariant().Contains(search))
+            if (search.Length != 0 && !vessel.Name.Contains(search, StringComparison.InvariantCultureIgnoreCase))
                 continue;
             if (_category != null && !vessel.Categories.Contains(_category))
                 continue;
diff --git a/Content.Client/_DV/Shipyard/UI/VesselRow.xaml b/Content.Client/_DV/Shipyard/UI/VesselRow.xaml
index eac2d3a1bde..e01f33e2939 100644
--- a/Content.Client/_DV/Shipyard/UI/VesselRow.xaml
+++ b/Content.Client/_DV/Shipyard/UI/VesselRow.xaml
@@ -3,7 +3,7 @@
                 HorizontalExpand="True">
     <BoxContainer Orientation="Horizontal"
                   HorizontalExpand="True">
-        <Button Name="Purchase" Text="{Loc 'purchase'}" StyleClasses="LabelSubText" />
+        <Button Name="Purchase" Text="{Loc 'shipyard-console-purchase'}" StyleClasses="LabelSubText" />
         <Label Name="VesselName" HorizontalExpand="True" />
         <PanelContainer>
             <PanelContainer.PanelOverride>
diff --git a/Content.Client/_DV/Shipyard/UI/VesselRow.xaml.cs b/Content.Client/_DV/Shipyard/UI/VesselRow.xaml.cs
index 2a946fb0a16..aa1f0a1c205 100644
--- a/Content.Client/_DV/Shipyard/UI/VesselRow.xaml.cs
+++ b/Content.Client/_DV/Shipyard/UI/VesselRow.xaml.cs
@@ -19,7 +19,7 @@ public VesselRow(VesselPrototype vessel, bool access)
         VesselName.Text = vessel.Name;
 
         var tooltip = new Tooltip();
-        tooltip.SetMessage(FormattedMessage.FromMarkup(vessel.Description));
+        tooltip.SetMessage(FormattedMessage.FromMarkupOrThrow(vessel.Description));
         Purchase.TooltipSupplier = _ => tooltip;
         Purchase.Disabled = !access;
         Purchase.OnPressed += _ => OnPurchasePressed?.Invoke();
diff --git a/Content.Server/_DV/Shipyard/ShipyardConsoleSystem.cs b/Content.Server/_DV/Shipyard/ShipyardConsoleSystem.cs
index 599dbc8de45..f6357671a05 100644
--- a/Content.Server/_DV/Shipyard/ShipyardConsoleSystem.cs
+++ b/Content.Server/_DV/Shipyard/ShipyardConsoleSystem.cs
@@ -2,12 +2,11 @@
 using Content.Server.Cargo.Systems;
 using Content.Server.Radio.EntitySystems;
 using Content.Server.Station.Systems;
+using Content.Shared.Cargo.Components;
 using Content.Shared.Shipyard;
 using Content.Shared.Shipyard.Prototypes;
 using Content.Shared.Whitelist;
-using Robust.Server.GameObjects;
 using Robust.Shared.Random;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Server.Shipyard;
 
@@ -26,7 +25,9 @@ public override void Initialize()
     {
         base.Initialize();
 
-        Subs.BuiEvents<ShipyardConsoleComponent>(ShipyardConsoleUiKey.Key, subs =>
+        SubscribeLocalEvent<ShipyardConsoleComponent, BankBalanceUpdatedEvent>(OnBalanceUpdated);
+        Subs.BuiEvents<ShipyardConsoleComponent>(ShipyardConsoleUiKey.Key,
+            subs =>
         {
             subs.Event<BoundUIOpenedEvent>(OnOpened);
         });
@@ -61,13 +62,17 @@ protected override void TryPurchase(Entity<ShipyardConsoleComponent> ent, Entity
 
         _cargo.UpdateBankAccount(bank, bank.Comp, -vessel.Price);
 
-        var message = Loc.GetString("shipyard-console-docking", ("vessel", vessel.Name.ToString()));
+        var message = Loc.GetString("shipyard-console-docking", ("vessel", vessel.Name));
         _radio.SendRadioMessage(ent, message, ent.Comp.Channel, ent);
         Audio.PlayPvs(ent.Comp.ConfirmSound, ent);
+    }
+
+    private void OnBalanceUpdated(Entity<ShipyardConsoleComponent> ent, ref BankBalanceUpdatedEvent args)
+    {
+        if (!_ui.IsUiOpen(ent.Owner, ShipyardConsoleUiKey.Key))
+            return;
 
-        // TODO: make the ui updating more robust, make pr upstream to have UpdateBankAccount support things that arent ordering consoles
-        // TODO: then have shipyard have that component and update the ui when it changes balance
-        UpdateUI(ent, bank.Comp.Balance);
+        UpdateUI(ent, args.Balance);
     }
 
     private void OnOpened(Entity<ShipyardConsoleComponent> ent, ref BoundUIOpenedEvent args)
diff --git a/Content.Server/_DV/Shipyard/ShipyardSystem.cs b/Content.Server/_DV/Shipyard/ShipyardSystem.cs
index 15905f7966a..3a282915b6f 100644
--- a/Content.Server/_DV/Shipyard/ShipyardSystem.cs
+++ b/Content.Server/_DV/Shipyard/ShipyardSystem.cs
@@ -6,7 +6,6 @@
 using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Content.Server.Shipyard;
 
diff --git a/Content.Shared/_DV/Shipyard/SharedShipyardConsoleSystem.cs b/Content.Shared/_DV/Shipyard/SharedShipyardConsoleSystem.cs
index ed04fb4944a..9a3cb03f59a 100644
--- a/Content.Shared/_DV/Shipyard/SharedShipyardConsoleSystem.cs
+++ b/Content.Shared/_DV/Shipyard/SharedShipyardConsoleSystem.cs
@@ -13,8 +13,8 @@ namespace Content.Shared.Shipyard;
 /// </summary>
 public abstract class SharedShipyardConsoleSystem : EntitySystem
 {
-    [Dependency] protected readonly AccessReaderSystem _access = default!;
-    [Dependency] protected readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly AccessReaderSystem _access = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] protected readonly SharedAudioSystem Audio = default!;
     [Dependency] protected readonly SharedPopupSystem Popup = default!;
     [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
@@ -23,7 +23,8 @@ public override void Initialize()
     {
         base.Initialize();
 
-        Subs.BuiEvents<ShipyardConsoleComponent>(ShipyardConsoleUiKey.Key, subs =>
+        Subs.BuiEvents<ShipyardConsoleComponent>(ShipyardConsoleUiKey.Key,
+            subs =>
         {
             subs.Event<ShipyardConsolePurchaseMessage>(OnPurchase);
         });
diff --git a/Content.Shared/_DV/Shipyard/ShipyardUi.cs b/Content.Shared/_DV/Shipyard/ShipyardUi.cs
index fbe085fb5dd..d22646760e0 100644
--- a/Content.Shared/_DV/Shipyard/ShipyardUi.cs
+++ b/Content.Shared/_DV/Shipyard/ShipyardUi.cs
@@ -11,26 +11,16 @@ public enum ShipyardConsoleUiKey : byte
 }
 
 [Serializable, NetSerializable]
-public sealed class ShipyardConsoleState : BoundUserInterfaceState
+public sealed class ShipyardConsoleState(int balance) : BoundUserInterfaceState
 {
-    public readonly int Balance;
-
-    public ShipyardConsoleState(int balance)
-    {
-        Balance = balance;
-    }
+    public readonly int Balance = balance;
 }
 
 /// <summary>
 /// Ask the server to purchase a vessel.
 /// </summary>
 [Serializable, NetSerializable]
-public sealed class ShipyardConsolePurchaseMessage : BoundUserInterfaceMessage
+public sealed class ShipyardConsolePurchaseMessage(string vessel) : BoundUserInterfaceMessage
 {
-    public readonly ProtoId<VesselPrototype> Vessel;
-
-    public ShipyardConsolePurchaseMessage(string vessel)
-    {
-        Vessel = vessel;
-    }
+    public readonly ProtoId<VesselPrototype> Vessel = vessel;
 }
diff --git a/Resources/Locale/en-US/_DV/shipyard/shipyard-console.ftl b/Resources/Locale/en-US/_DV/shipyard/shipyard-console.ftl
index 3ee9f4471a3..50917d8f8b2 100644
--- a/Resources/Locale/en-US/_DV/shipyard/shipyard-console.ftl
+++ b/Resources/Locale/en-US/_DV/shipyard/shipyard-console.ftl
@@ -2,3 +2,4 @@ shipyard-console-menu-title = Shipyard Console
 
 shipyard-console-error = Temporary embargo is in place, try later?
 shipyard-console-docking = {$vessel} is en route to the station, eta 60 seconds.
+shipyard-console-purchase = Purchase
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/computers.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/computers.yml
index f5809c5efab..907b9d0924c 100644
--- a/Resources/Prototypes/_DV/Entities/Structures/Machines/computers.yml
+++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/computers.yml
@@ -5,6 +5,7 @@
   description: Used to purchase and sell shuttles
   components:
   - type: ShipyardConsole
+  - type: BankClient
   - type: AccessReader
     access: [[ Captain ]]
   - type: ActivatableUI