Index: ps/trunk/binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/credits/texts/programming.json
+++ ps/trunk/binaries/data/mods/public/gui/credits/texts/programming.json
@@ -174,6 +174,7 @@
 				{ "nick": "mpmoreti", "name": "Marcos Paulo Moreti" },
 				{ "nick": "mreiland", "name": "Michael Reiland" },
 				{ "nick": "myconid" },
+				{ "nick": "n1xc0d3r", "name": "Luis Guerrero" },
 				{ "nick": "nani", "name": "S. N." },
 				{ "nick": "nd3c3nt", "name": "Gavin Fowler" },
 				{ "nick": "nephele" },
Index: ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js
+++ ps/trunk/binaries/data/mods/public/gui/session/selection_panels.js
@@ -593,7 +593,9 @@
 				}));
 
 		let sortedEntStates = unitEntStates.sort((a, b) =>
-			(!b.upgrade || !b.upgrade.isUpgrading) - (!a.upgrade || !a.upgrade.isUpgrading));
+			(!b.upgrade || !b.upgrade.isUpgrading) - (!a.upgrade || !a.upgrade.isUpgrading) ||
+		 	(!a.production ? 0 : a.production.queue.length) - (!b.production ? 0 : b.production.queue.length)
+		 );
 
 		for (let state of sortedEntStates)
 		{