Index: binaries/data/mods/public/gui/session/selection_details.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_details.js
+++ binaries/data/mods/public/gui/session/selection_details.js
@@ -318,6 +318,63 @@
 			showTemplateDetails(entState.template);
 		};
 
+	let SetupStat = (panel, i, icon, text) => {
+		if (!text)
+		{
+			Engine.GetGUIObjectByName(`${panel}[${i}]`).hidden = true;
+			return;
+		}
+		Engine.GetGUIObjectByName(`${panel}[${i}]`).hidden = false;
+		Engine.GetGUIObjectByName(`${panel}Icon[${i}]`).sprite = "stretched:color:255 255 255 30:textureAsMask:" + icon;
+		let size = Engine.GetGUIObjectByName(`${panel}[${i}]`).size;
+		size.top = 30*i;
+		size.bottom = 30*i+28;
+		Engine.GetGUIObjectByName(`${panel}[${i}]`).size = size;
+		Engine.GetGUIObjectByName(`${panel}Text[${i}]`).caption = text;
+	};
+
+	// Left-hand side of the stats panel
+	// DPS first.
+	if (!!template?.attack?.Melee || !!template?.attack?.Ranged)
+	{
+		let DPS = (template?.attack?.Melee || template?.attack?.Ranged)?.Damage;
+		DPS = (DPS?.Hack || 0) + (DPS?.Pierce || 0) + (DPS?.Crush || 0);
+		SetupStat("LHS", 0, "session/icons/dps.png",
+			(DPS / (template?.attack?.Melee || template?.attack?.Ranged).repeatTime * 1000).toFixed(1));
+	}
+	else
+		SetupStat("LHS", 0);
+
+	// Capture DPS
+	if (!!template?.attack?.Capture)
+	{
+		let CDPS = template.attack.Capture.Capture || 0;
+		SetupStat("LHS", 1, "session/icons/cdps.png",
+			(CDPS / template.attack.Capture.repeatTime * 1000).toFixed(1));
+	}
+	else
+		SetupStat("LHS", 1);
+
+	// Range
+	if (!!template?.attack?.Ranged)
+		SetupStat("LHS", 2, "session/icons/range.png", template.attack.Ranged.maxRange || 0);
+	else
+		SetupStat("LHS", 2);
+
+	// Right-hand side -> resistances
+	if (!!template?.resistance?.Damage)
+	{
+		SetupStat("RHS", 0, "session/icons/res_hack.png", template.resistance.Damage?.Hack || 0);
+		SetupStat("RHS", 1, "session/icons/res_pierce.png", template.resistance.Damage?.Pierce || 0);
+		SetupStat("RHS", 2, "session/icons/res_crush.png", template.resistance.Damage?.Crush || 0);
+	}
+	else
+	{
+		SetupStat("RHS", 0);
+		SetupStat("RHS", 1);
+		SetupStat("RHS", 2);
+	}
+
 	let detailedTooltip = [
 		getAttackTooltip,
 		getHealerTooltip,
@@ -332,7 +389,7 @@
 	].map(func => func(entState)).filter(tip => tip).join("\n");
 	if (detailedTooltip)
 	{
-		Engine.GetGUIObjectByName("attackAndResistanceStats").hidden = false;
+		Engine.GetGUIObjectByName("attackAndResistanceStats").hidden = true;
 		Engine.GetGUIObjectByName("attackAndResistanceStats").tooltip = detailedTooltip;
 	}
 	else
Index: binaries/data/mods/public/gui/session/selection_panels.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels.js
+++ binaries/data/mods/public/gui/session/selection_panels.js
@@ -104,8 +104,9 @@
 g_SelectionPanels.Command = {
 	"getMaxNumberOfItems": function()
 	{
-		return 6;
+		return 10;
 	},
+	"rowLength": 10,
 	"getItems": function(unitEntStates)
 	{
 		let commands = [];
@@ -138,14 +139,7 @@
 
 		data.icon.sprite = "stretched:session/icons/" + data.item.icon;
 
-		let size = data.button.size;
-		// relative to the center ( = 50%)
-		size.rleft = 50;
-		size.rright = 50;
-		// offset from the center calculation, count on square buttons, so size.bottom is the width too
-		size.left = (data.i - data.numberOfItems / 2) * (size.bottom + 1);
-		size.right = size.left + size.bottom;
-		data.button.size = size;
+		setPanelObjectPosition(data.button, data.i + 30, data.rowLength);
 		return true;
 	}
 };
@@ -153,7 +147,7 @@
 g_SelectionPanels.Construction = {
 	"getMaxNumberOfItems": function()
 	{
-		return 40 - getNumberOfRightPanelButtons();
+		return 30 - getNumberOfRightPanelButtons();
 	},
 	"rowLength": 10,
 	"getItems": function()
@@ -359,7 +353,7 @@
 g_SelectionPanels.Gate = {
 	"getMaxNumberOfItems": function()
 	{
-		return 40 - getNumberOfRightPanelButtons();
+		return 30 - getNumberOfRightPanelButtons();
 	},
 	"rowLength": 10,
 	"getItems": function(unitEntStates)
@@ -401,7 +395,7 @@
 g_SelectionPanels.Pack = {
 	"getMaxNumberOfItems": function()
 	{
-		return 40 - getNumberOfRightPanelButtons();
+		return 30 - getNumberOfRightPanelButtons();
 	},
 	"rowLength": 10,
 	"getItems": function(unitEntStates)
@@ -788,7 +782,7 @@
 			if (template.icon)
 				icon.sprite = modifier + "stretched:session/portraits/" + template.icon;
 
-			setPanelObjectPosition(button, position, data.rowLength);
+			setPanelObjectPosition(button, position + data.rowLength, data.rowLength);
 
 			// Prepare to handle the top button (if any)
 			position -= data.rowLength;
@@ -913,7 +907,7 @@
 g_SelectionPanels.Training = {
 	"getMaxNumberOfItems": function()
 	{
-		return 40 - getNumberOfRightPanelButtons();
+		return 30 - getNumberOfRightPanelButtons();
 	},
 	"rowLength": 10,
 	"getItems": function()
@@ -1021,7 +1015,7 @@
 g_SelectionPanels.Upgrade = {
 	"getMaxNumberOfItems": function()
 	{
-		return 40 - getNumberOfRightPanelButtons();
+		return 30 - getNumberOfRightPanelButtons();
 	},
 	"rowLength": 10,
 	"getItems": function(unitEntStates)
Index: binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
+++ binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
@@ -1,26 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Details panel for a single entity. -->
 <object name="detailsAreaSingle"
-	size="4 4 100%-4 100%-44"
+	size="4 4 100%-4 100%-1"
 >
 
+	<!-- Big unit icon -->
+	<object size="0 0 96 96" type="button" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
+		<object size="1 1 100%-1 100%-1" type="image" name="icon" ghost="true"/>
+
+		<!-- Experience bar -->
+		<object size="2 2 6 100%-2" type="image" name="experience" tooltip_style="sessionToolTip">
+			<translatableAttribute id="tooltip">Experience</translatableAttribute>
+			<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+			<object type="image" sprite="experienceBackground" ghost="true"/>
+			<object type="image" sprite="experienceForeground" ghost="true" name="experienceBar"/>
+			<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
+		</object>
+
+		<object z="20" size="4 4 20 20" name="rankIcon" type="image" tooltip_style="sessionToolTip">
+			<translatableAttribute id="tooltip">Rank</translatableAttribute>
+		</object>
+
+		<!-- Status Effects icons -->
+		<object  name="statusEffectsIcons" size="100%-20 4 100%-4 100%">
+			<repeat count="5">
+				<object type="image" size="0 0 16 16" z="200" tooltip_style="sessionToolTip"/>
+			</repeat>
+		</object>
+	</object>
+
 	<!-- Stats Bars -->
-	<object size= "0 0 100% 96" type="image" tooltip_style="sessionToolTip">
-
-		<object size="0 0 100% 60" type="image" sprite="topEdgedPanelShader">
+	<object size="0 96+1 96+1 100%-60" type="image" sprite="panelShader">
+		<object size="0 0 100%-1 100%">
 
 			<!-- Placeholders storing the position for the bars. -->
-			<object size="96 1 100% 24" name="sectionPosTop" hidden="true"/>
-			<object size="96 11 100% 34" name="sectionPosMiddle" hidden="true"/>
-			<object size="96 32 100% 55" name="sectionPosBottom" hidden="true"/>
+			<object size="0 1 100% 16" name="sectionPosTop" hidden="true"/>
+			<object size="0 11 100% 34" name="sectionPosMiddle" hidden="true"/>
+			<object size="0 20 100% 35" name="sectionPosBottom" hidden="true"/>
 
 			<!-- Health bar -->
 			<object name="healthSection">
-				<object size="0 0 100% 12" name="healthLabel" type="text" style="StatsTextLeft" ghost="true">
+				<object size="0 0 100% 10" name="healthLabel" type="text" style="StatsTextLeft" ghost="true">
 					<translatableAttribute id="tooltip">Health</translatableAttribute>
 				</object>
-				<object size="0 0 100% 12" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
-				<object size="1 14 100% 21" name="health" type="image" tooltip_style="sessionToolTip">
+				<object size="0 0 100% 10" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
+				<object size="1 11 100% 16" name="health" type="image" tooltip_style="sessionToolTip">
 					<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 					<object type="image" sprite="healthBackground" ghost="true"/>
 					<object type="image" sprite="healthForeground" ghost="true" name="healthBar"/>
@@ -30,11 +54,11 @@
 
 			<!-- Capture bar -->
 			<object name="captureSection">
-				<object size="0 0 100% 12" name="captureLabel" type="text" style="StatsTextLeft" ghost="true">
+				<object size="0 0 100% 10" name="captureLabel" type="text" style="StatsTextLeft" ghost="true">
 					<translatableAttribute id="tooltip">Capture points</translatableAttribute>
 				</object>
-				<object size="0 0 100% 12" name="captureStats" type="text" style="StatsTextRight" ghost="true"/>
-				<object size="1 14 100% 21" name="capture" type="image" tooltip_style="sessionToolTip">
+				<object size="0 0 100% 10" name="captureStats" type="text" style="StatsTextRight" ghost="true"/>
+				<object size="1 11 100% 16" name="capture" type="image" tooltip_style="sessionToolTip">
 					<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 					<repeat count="9">
 						<object type="image" sprite="playerColorBackground" ghost="true" name="captureBar[n]" hidden="true"/>
@@ -45,9 +69,9 @@
 
 			<!-- Resource bar -->
 			<object name="resourceSection">
-				<object size="0 0 100% 12" name="resourceLabel" type="text" style="StatsTextLeft" ghost="true"/>
-				<object size="0 0 100% 12" name="resourceStats" type="text" style="StatsTextRight" ghost="true"/>
-				<object size="1 14 100% 21" name="resources" type="image">
+				<object size="0 0 100% 10" name="resourceLabel" type="text" style="StatsTextLeft" ghost="true"/>
+				<object size="0 0 100% 10" name="resourceStats" type="text" style="StatsTextRight" ghost="true"/>
+				<object size="1 11 100% 16" name="resources" type="image">
 					<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 					<object type="image" sprite="resourceBackground" ghost="true"/>
 					<object type="image" sprite="resourceForeground" ghost="true" name="resourceBar"/>
@@ -55,56 +79,65 @@
 				</object>
 			</object>
 		</object>
+	</object>
 
-		<object size="0 59 100% 95" type="image" sprite="edgedPanelShader">
-			<!-- Attack and Resistance -->
-			<object size="96 0 128 32" name="attackAndResistanceStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
-				<translatableAttribute id="tooltip">Attack and Resistance</translatableAttribute>
-			</object>
-
-			<!-- Resource carrying icon/counter -->
-			<!-- Used also for number of gatherers/builders -->
-			<object size="100%-96 0 100%-36 32" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
-			<object size="100%-32 0 100% 32" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
-		</object>
+	<!-- Other stuff -->
+	<object size= "97 0 100% 96" type="image"
+		sprite="panelShader"
+		tooltip_style="sessionToolTip">
 
-		<!-- Big unit icon -->
-		<object size="0 0 96 96" type="button" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
-			<object size="1 1 100%-1 100%-1" type="image" name="icon" ghost="true"/>
-
-			<!-- Experience bar -->
-			<object size="2 2 6 100%-2" type="image" name="experience" tooltip_style="sessionToolTip">
-				<translatableAttribute id="tooltip">Experience</translatableAttribute>
-				<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-				<object type="image" sprite="experienceBackground" ghost="true"/>
-				<object type="image" sprite="experienceForeground" ghost="true" name="experienceBar"/>
-				<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
+		<!-- Left-hand side (attacks) -->
+		<repeat count="3">
+			<object name="LHS[n]" size="0% 60 50% 88">
+				<object size="4 0 28 28" name="LHSIcon[n]" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
+					<translatableAttribute id="tooltip">Range</translatableAttribute>
+				</object>
+				<object size="28 0 100% 100%" name="LHSText[n]" type="text"
+					style="CarryingTextLeft">
+					<translatableAttribute id="caption">70</translatableAttribute>
+				</object>
 			</object>
+		</repeat>
 
-			<object z="20" size="4 4 20 20" name="rankIcon" type="image" tooltip_style="sessionToolTip">
-				<translatableAttribute id="tooltip">Rank</translatableAttribute>
+		<!-- Right-hand side (resistance) -->
+		<repeat count="3">
+			<object name="RHS[n]" size="50% 60 100% 88">
+				<object size="4 0 28 28" name="RHSIcon[n]" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
+					<translatableAttribute id="tooltip">Range</translatableAttribute>
+				</object>
+				<object size="28 0 100% 100%" name="RHSText[n]" type="text"
+					style="CarryingTextLeft">
+					<translatableAttribute id="caption">70</translatableAttribute>
+				</object>
 			</object>
+		</repeat>
 
-			<!-- Status Effects icons -->
-			<object  name="statusEffectsIcons" size="100%-20 4 100%-4 100%">
-				<repeat count="5">
-					<object type="image" size="0 0 16 16" z="200" tooltip_style="sessionToolTip"/>
-				</repeat>
-			</object>
+		<!-- Attack and Resistance -->
+		<object size="96 0 128 32" name="attackAndResistanceStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
+			<translatableAttribute id="tooltip">Attack and Resistance</translatableAttribute>
 		</object>
 	</object>
 
+	<object size= "97 97 100% 100%-60" type="image"
+		sprite="panelShader"
+		tooltip_style="sessionToolTip">
+		<!-- Resource carrying icon/counter -->
+		<!-- Used also for number of gatherers/builders -->
+		<object size="100%-96 0 100%-36 32" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
+		<object size="100%-32 0 100% 32" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
+	</object>
+
 	<!-- Names and civilization emblem etc. (This must come before the attack and resistance icon to avoid clipping issues.) -->
-	<object size="0 92 100% 100%" name="statsArea" type="image" sprite="edgedPanelShader">
+	<object size="0 100%-60 100% 100%" name="statsArea" type="image" sprite="topEdgedPanelShader">
 
 		<!-- Specific and generic names. -->
 		<object z="30">
-			<object size="0 2 100% 22" name="specific" ghost="true" type="text" style="SpecificNameCentered"/>
-			<object size="0 17 100% 37" name="generic" ghost="true" type="text" style="GenericNameCentered"/>
+			<object size="0 1 100% 22" name="specific" ghost="true" type="text" style="SpecificNameCentered"/>
+			<object size="0 17 100% 36" name="generic" ghost="true" type="text" style="GenericNameCentered"/>
 		</object>
 
 		<!-- Civilization tooltip. -->
-		<object size="0 38 100% 62" tooltip_style="sessionToolTip">
+		<object size="0 36 100% 60" tooltip_style="sessionToolTip">
 			<!-- Images to clip off the top and bottom of the civilization emblem. -->
 			<object z="20" size="0 50%-64 100% 50%-12" ghost="true" type="image" sprite="remove"/>
 			<object z="20" size="0 50%+12 100% 50%+64" ghost="true" type="image" sprite="remove"/>
Index: binaries/data/mods/public/gui/session/selection_panels_middle/unit_commands.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_middle/unit_commands.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Unit Commands -->
-<object name="unitCommandPanel"
-	size="0 100%-40 100% 100%-4"
-	type="image"
-	z="30"
->
-	<object size="0 0 100% 100%">
-		<repeat count="6">
-			<object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
-				<object name="unitCommandIcon[n]" ghost="true" type="image" style="commandIcon"/>
-				<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text"/>
-			</object>
-		</repeat>
-	</object>
-</object>
Index: binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <object name="unitResearchPanel"
-	size="6 100%-82 100% 100%"
+	size="6 6 100% 100%"
+	z="29"
 >
 	<object>
 		<repeat count="20">
Index: binaries/data/mods/public/gui/session/selection_panels_right/unit_commands.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/session/selection_panels_right/unit_commands.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Unit Commands -->
+<object name="unitCommandPanel"
+	size="6 6 100% 100%"
+	type="image"
+	z="28"
+>
+	<repeat count="10">
+		<object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottomBold">
+			<object name="unitCommandIcon[n]" ghost="true" type="image" style="commandIcon"/>
+			<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text"/>
+		</object>
+	</repeat>
+</object>
Index: binaries/data/mods/public/gui/session/styles.xml
===================================================================
--- binaries/data/mods/public/gui/session/styles.xml
+++ binaries/data/mods/public/gui/session/styles.xml
@@ -125,7 +125,7 @@
 	/>
 
 	<style name="StatsTextLeft"
-		font="sans-stroke-12"
+		font="mono-stroke-10"
 		textcolor="white"
 		text_align="left"
 		text_valign="center"
@@ -133,7 +133,7 @@
 	/>
 
 	<style name="StatsTextCentered"
-		font="sans-stroke-12"
+		font="mono-stroke-10"
 		textcolor="white"
 		text_align="center"
 		text_valign="center"
@@ -141,13 +141,21 @@
 	/>
 
 	<style name="StatsTextRight"
-		font="sans-stroke-12"
+		font="mono-stroke-10"
 		textcolor="white"
 		text_align="right"
 		text_valign="center"
 		ghost="true"
 	/>
 
+	<style name="CarryingTextLeft"
+		font="sans-bold-stroke-13"
+		textcolor="white"
+		text_align="left"
+		text_valign="center"
+		ghost="true"
+	/>
+
 	<style name="CarryingTextRight"
 		font="sans-bold-stroke-13"
 		textcolor="white"