diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml
index 975711dd23a..8d6299e529e 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/computers_tabletop.yml
@@ -56,6 +56,7 @@
   name: shipyard console
   components:
   - type: Sprite
+    drawdepth: SmallObjects
     layers:
     - map: ["computerLayerBody"]
       sprite: _NF/Structures/Machines/computer_tabletop.rsi
@@ -65,18 +66,24 @@
       state: generic_keyboard_tabletop
     - map: ["computerLayerScreen"]
       sprite: _NF/Structures/Machines/computers.rsi
-      state: generic
+      state: shipyard
     - map: ["computerLayerKeys"]
       sprite: _NF/Structures/Machines/computers.rsi
-      state: generic_keys
+      state: telesci_key
+  - type: Fixtures
+    fixtures:
+      fix1:
+        density: 500
+        mask:
+        - TabletopMachineMask
 
 - type: entity
-  parent: [ ComputerTabletopShipyard, BaseMothershipComputer ]
+  parent: [ BaseMothershipComputer, ComputerTabletopShipyard ]
   id: BaseMothershipComputerTabletop
   name: mothership console
-  description: Used on motherships to purchase and sell ships without returning to a station.
   components:
   - type: Sprite
+    drawdepth: SmallObjects
     layers:
     - map: ["computerLayerBody"]
       sprite: _NF/Structures/Machines/computer_tabletop.rsi
@@ -86,10 +93,16 @@
       state: generic_keyboard_tabletop
     - map: ["computerLayerScreen"]
       sprite: _NF/Structures/Machines/computers.rsi
-      state: generic
+      state: shipyard
     - map: ["computerLayerKeys"]
       sprite: _NF/Structures/Machines/computers.rsi
-      state: generic_keys
+      state: telesci_key
+  - type: Fixtures
+    fixtures:
+      fix1:
+        density: 500
+        mask:
+        - TabletopMachineMask
 
 # Computers: Base Game
 - type: entity
@@ -718,7 +731,7 @@
 # Computers: Frontier
 
 - type: entity
-  parent: [ ComputerTabletopShipyard, ComputerShipyardSecurity ]
+  parent: [ ComputerShipyardSecurity, ComputerTabletopShipyard ]
   id: ComputerTabletopShipyardSecurity
   name: security shipyard console
   components:
@@ -738,7 +751,7 @@
       state: telesci_key
 
 - type: entity
-  parent: [ ComputerTabletopShipyard, ComputerShipyardBlackMarket ]
+  parent: [ ComputerShipyardBlackMarket, ComputerTabletopShipyard ]
   id: ComputerTabletopShipyardBlackMarket
   name: black market shipyard console
   components:
@@ -758,7 +771,7 @@
       state: blackmarket_key
 
 - type: entity
-  parent: [ ComputerTabletopShipyard, ComputerShipyardExpedition ]
+  parent: [ ComputerShipyardExpedition, ComputerTabletopShipyard ]
   id: ComputerTabletopShipyardExpedition
   name: expedition shipyard console
   components:
@@ -778,7 +791,7 @@
       state: blackmarket_key
 
 - type: entity
-  parent: [ ComputerTabletopShipyard, ComputerShipyardScrap ]
+  parent: [ ComputerShipyardScrap, ComputerTabletopShipyard ]
   id: ComputerTabletopShipyardScrap
   name: scrapyard console
   components:
@@ -798,7 +811,7 @@
       state: blackmarket_key
 
 - type: entity
-  parent: [ BaseComputerTabletop, ComputerPalletConsoleNFNormalMarket ]
+  parent: [ ComputerPalletConsoleNFNormalMarket, BaseComputerTabletop ]
   id: ComputerTabletopPalletConsoleNFNormalMarket
   name: cargo sale computer
   suffix: Normal, Tabletop
@@ -819,16 +832,16 @@
       state: tech_key
 
 - type: entity
-  parent: [ ComputerTabletopPalletConsoleNFNormalMarket, ComputerPalletConsoleNFHighMarket]
+  parent: [ ComputerPalletConsoleNFHighMarket, ComputerTabletopPalletConsoleNFNormalMarket ]
   id: ComputerTabletopPalletConsoleNFHighMarket
   suffix: High, Tabletop
 
 - type: entity
-  parent: [ ComputerTabletopPalletConsoleNFNormalMarket, ComputerPalletConsoleNFLowMarket ]
+  parent: [ ComputerPalletConsoleNFLowMarket, ComputerTabletopPalletConsoleNFNormalMarket ]
   id: ComputerTabletopPalletConsoleNFLowMarket
   suffix: Low, Tabletop
 
 - type: entity
-  parent: [ ComputerTabletopPalletConsoleNFNormalMarket, ComputerPalletConsoleNFVeryLowMarket ]
+  parent: [ ComputerPalletConsoleNFVeryLowMarket, ComputerTabletopPalletConsoleNFNormalMarket ]
   id: ComputerTabletopPalletConsoleNFVeryLowMarket
   suffix: VeryLow, Tabletop
\ No newline at end of file