Index: binaries/data/mods/mod/gui/common/modern/sprites.xml
===================================================================
--- binaries/data/mods/mod/gui/common/modern/sprites.xml
+++ binaries/data/mods/mod/gui/common/modern/sprites.xml
@@ -153,6 +153,59 @@
 		/>
 	</sprite>
 
+	<sprite name="ModernDialogNoTitle">
+
+		<!-- background -->
+		<image texture = "global/modern/background.png"
+			texture_size = "0 0 512 512"
+			size = "4 0 100%-4 100%-4"
+		/>
+
+		<!-- shading -->
+		<!-- we just mirror the same texture on the top and bottom -->
+		<image texture = "global/modern/shadow-low.png"
+			texture_size = "0 0 1024 128"
+			size = "4 100%-132 100%-4 100%-4"
+		/>
+
+		<image texture = "global/modern/shadow-low.png"
+			texture_size = "1024 128 0 0"
+			size = "4 0 100%-4 128"
+		/>
+
+		<!-- top and bottom edge -->
+		<image texture = "global/modern/border.png"
+			real_texture_placement = "0 0 2048 8"
+			size = "4 0%-4 100%-4 4"
+		/>
+		<image texture = "global/modern/border.png"
+			real_texture_placement = "0 0 2048 8"
+			size = "4 100%-8 100%-4 100%"
+		/>
+
+		<!-- corners -->
+		<image texture = "global/modern/dialog-deco-top.png"
+			real_texture_placement = "0 0 64 32"
+			texture_size = "64 0 0 32"
+			size = "-14 -21 50 11"
+		/>
+		<image texture = "global/modern/dialog-deco-top.png"
+			real_texture_placement = "0 0 64 32"
+			texture_size = "0 0 64 32"
+			size = "100%-50 -21 100%+14 11"
+		/>
+		<image texture = "global/modern/dialog-deco-bottom.png"
+			real_texture_placement = "0 0 64 32"
+			texture_size = "64 0 0 32"
+			size = "-31 100%-23 33 100%+9"
+		/>
+		<image texture = "global/modern/dialog-deco-bottom.png"
+			real_texture_placement = "0 0 64 32"
+			texture_size = "0 0 64 32"
+			size = "100%-31 100%-23 100%+33 100%+9"
+		/>
+	</sprite>
+
 		<!--
 	==========================================
 	- Panel -
Index: binaries/data/mods/public/gui/common/tooltips.js
===================================================================
--- binaries/data/mods/public/gui/common/tooltips.js
+++ binaries/data/mods/public/gui/common/tooltips.js
@@ -122,6 +122,22 @@
 	return bodyFont(template.tooltip);
 }
 
+function getDescriptionTooltip(template)
+{
+	if (!template.description)
+		return "";
+
+	return bodyFont(template.description);
+}
+
+function getHistoryTooltip(template)
+{
+	if (!template.history)
+		return "";
+
+	return bodyFont(template.history);
+}
+
 function getHealthTooltip(template)
 {
 	if (!template.health)
@@ -573,6 +589,26 @@
 }
 
 /**
+ * Returns the resources this entity supplies in the specified entity's tooltip
+ */
+function getResourceSupplyTooltip(template)
+{
+	if (!template.supply)
+		return "";
+
+	let supply = template.supply;
+	let type = (supply.type[0] === "treasure") ? supply.type[1] : supply.type[0];
+
+	let txt = g_TooltipTextFormats.header[0] + translate("Resource Supply:") + g_TooltipTextFormats.header[1] + " ";
+	txt += sprintf(translate("%(component)s %(amount)s"), {
+		component: resourceIcon(type),
+		amount: Number.isFinite(+supply.amount) ? supply.amount : translate("∞")
+	});
+
+	return txt;
+}
+
+/**
  * Returns the population bonus information to display in the specified entity's construction button tooltip.
  */
 function getPopulationBonusTooltip(template)
Index: binaries/data/mods/public/gui/page_viewer.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/page_viewer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
+
+	<include>common/setup_resources.xml</include>
+	<include>common/sprites.xml</include>
+	<include>common/styles.xml</include>
+
+	<include>reference/common/sprites.xml</include>
+	<include>reference/common/styles.xml</include>
+
+	<include>reference/viewer/styles.xml</include>
+	<include>reference/viewer/sprites.xml</include>
+	<include>reference/viewer/viewer.xml</include>
+
+	<include>reference/common/setup.xml</include>
+</page>
Index: binaries/data/mods/public/gui/reference/common/core.js
===================================================================
--- binaries/data/mods/public/gui/reference/common/core.js
+++ binaries/data/mods/public/gui/reference/common/core.js
@@ -1,4 +1,4 @@
-var g_SelectedCiv = "";
+var g_SelectedCiv = "gaia";
 var g_CallbackSet = false;
 
 /**
@@ -182,3 +182,19 @@
 
 	return templateLists;
 }
+
+function setViewerOnPress(guiObject, templateName)
+{
+	if (typeof guiObject === "string")
+		guiObject = Engine.GetGUIObjectByName(guiObject);
+
+	guiObject.onPressRight = function () { Engine.PushGuiPage("page_viewer.xml", {
+		"templateName": templateName,
+		"civ": g_SelectedCiv,
+	}); };
+}
+
+function unsetViewerOnPress(guiObject)
+{
+	guiObject.onPressRight = function () {};
+}
Index: binaries/data/mods/public/gui/reference/common/draw.js
===================================================================
--- binaries/data/mods/public/gui/reference/common/draw.js
+++ binaries/data/mods/public/gui/reference/common/draw.js
@@ -6,11 +6,7 @@
 /**
  * These functions are defined in gui/common/tooltips.js
  */
-var g_TooltipFunctions = [
-	getEntityNamesFormatted,
-	getEntityCostTooltip,
-	getEntityTooltip,
-	getAurasTooltip,
+var g_EntityStatFunctions = [
 	getHealthTooltip,
 	getHealerTooltip,
 	getAttackTooltip,
@@ -20,10 +16,18 @@
 	getProjectilesTooltip,
 	getSpeedTooltip,
 	getGatherTooltip,
+	getResourceSupplyTooltip,
 	getPopulationBonusTooltip,
 	getResourceTrickleTooltip,
 	getLootTooltip
 ];
+var g_TooltipFunctions = [
+	getEntityNamesFormatted,
+	getEntityCostTooltip,
+	getEntityTooltip,
+	getAurasTooltip
+].concat(g_EntityStatFunctions);
+g_TooltipFunctions.push(getRightClickMessage);
 
 /**
  * Concatanates the return values of the array of passed functions.
@@ -37,3 +41,8 @@
 {
 	return textFunctions.map(func => func(template)).filter(tip => tip).join(joiner);
 }
+
+function getRightClickMessage()
+{
+	return translate("Right-click for more information.");
+}
Index: binaries/data/mods/public/gui/reference/common/helper.js
===================================================================
--- binaries/data/mods/public/gui/reference/common/helper.js
+++ binaries/data/mods/public/gui/reference/common/helper.js
@@ -24,6 +24,7 @@
 		upgrade.entity = upgrade.entity.replace("{civ}", g_SelectedCiv);
 
 		let data = GetTemplateDataHelper(loadTemplate(upgrade.entity), null, g_AuraData, g_ResourceData);
+		data.name.internal = upgrade.entity;
 		data.cost = upgrade.cost;
 		data.icon = upgrade.icon || data.icon;
 		data.tooltip = upgrade.tooltip || data.tooltip;
Index: binaries/data/mods/public/gui/reference/common/load.js
===================================================================
--- binaries/data/mods/public/gui/reference/common/load.js
+++ binaries/data/mods/public/gui/reference/common/load.js
@@ -35,7 +35,7 @@
 	{
 		// We need to clone the template because we want to perform some translations.
 		let data = clone(Engine.GetTemplate(templateName));
-		translateObjectKeys(data, ["GenericName", "SpecificName", "Tooltip"]);
+		translateObjectKeys(data, ["GenericName", "SpecificName", "Tooltip", "History"]);
 
 		if (data.Auras)
 			for (let auraID of data.Auras._string.split(/\s+/))
@@ -60,7 +60,7 @@
 	if (!(templateName in g_TechnologyData))
 	{
 		let data = Engine.ReadJSONFile(g_TechnologyPath + templateName + ".json");
-		translateObjectKeys(data, ["genericName", "tooltip"]);
+		translateObjectKeys(data, ["genericName", "tooltip", "description"]);
 
 		g_TechnologyData[templateName] = data;
 	}
@@ -102,6 +102,9 @@
 
 	let template = loadTemplate(templateName);
 	let unit = GetTemplateDataHelper(template, null, g_AuraData, g_ResourceData, g_CurrentModifiers);
+	unit.name.internal = templateName;
+
+	unit.history = template.Identity.History;
 
 	if (template.ProductionQueue)
 	{
@@ -128,6 +131,12 @@
 		}
 	}
 
+	if (template.Identity.Rank)
+		unit.promotion = {
+			"current_rank": template.Identity.Rank,
+			"entity": (template.Promotion) ? template.Promotion.Entity : null
+		};
+
 	if (template.Builder && template.Builder.Entities._string)
 	{
 		unit.builder = [];
@@ -142,6 +151,12 @@
 	if (unit.upgrades)
 		unit.upgrades = getActualUpgradeData(unit.upgrades);
 
+	if (template.ResourceSupply)
+		unit.supply = {
+			"type": template.ResourceSupply.Type.split("."),
+			"amount": template.ResourceSupply.Amount,
+		};
+
 	return unit;
 }
 
@@ -158,6 +173,9 @@
 
 	let template = loadTemplate(templateName);
 	let structure = GetTemplateDataHelper(template, null, g_AuraData, g_ResourceData, g_CurrentModifiers);
+	structure.name.internal = templateName;
+
+	structure.history = template.Identity.History;
 
 	structure.production = {
 		"technology": [],
@@ -236,9 +254,31 @@
 			});
 	}
 
+	if (template.ResourceSupply)
+		structure.supply = {
+			"type": template.ResourceSupply.Type.split("."),
+			"amount": template.ResourceSupply.Amount,
+		};
+
 	return structure;
 }
 
+function loadResource(templateName)
+{
+	let template = loadTemplate(templateName);
+	let resource = GetTemplateDataHelper(template);
+	resource.name.internal = templateName;
+
+	resource.history = template.Identity.History;
+
+	resource.supply = {
+		"type": template.ResourceSupply.Type.split("."),
+		"amount": template.ResourceSupply.Amount,
+	};
+
+	return resource;
+}
+
 /**
  * Load and parse technology from json template.
  *
@@ -249,6 +289,7 @@
 {
 	let template = loadTechData(techName);
 	let tech = GetTechnologyDataHelper(template, g_SelectedCiv, g_ResourceData);
+	tech.name.internal = "tech/" + techName;
 
 	if (template.pair !== undefined)
 	{
Index: binaries/data/mods/public/gui/reference/structree/draw.js
===================================================================
--- binaries/data/mods/public/gui/reference/structree/draw.js
+++ binaries/data/mods/public/gui/reference/structree/draw.js
@@ -49,6 +49,7 @@
 			Engine.GetGUIObjectByName("phase["+i+"]_struct["+s+"]_name").caption =
 				translate(stru.name.specific);
 
+			setViewerOnPress("phase["+i+"]_struct["+s+"]_icon", stru.name.internal);
 			thisEle.hidden = false;
 
 			for (let r in g_DrawLimits[pha].prodQuant)
@@ -156,6 +157,7 @@
 		Engine.GetGUIObjectByName("trainer["+t+"]_icon").sprite = "stretched:session/portraits/"+trainer.icon;
 		Engine.GetGUIObjectByName("trainer["+t+"]_icon").tooltip = buildText(trainer, g_TooltipFunctions);
 		Engine.GetGUIObjectByName("trainer["+t+"]_name").caption = translate(trainer.name.specific);
+		setViewerOnPress("trainer["+t+"]_icon", trainer.name.internal);
 		thisEle.hidden = false;
 
 		let p = 0;
@@ -244,6 +246,7 @@
 	prodEle.sprite = "stretched:session/portraits/"+template.icon;
 	prodEle.tooltip = buildText(template, g_TooltipFunctions);
 	prodEle.hidden = false;
+	setViewerOnPress(prodEle, template.name.internal);
 	return true;
 }
 
Index: binaries/data/mods/public/gui/reference/structree/rows.xml
===================================================================
--- binaries/data/mods/public/gui/reference/structree/rows.xml
+++ binaries/data/mods/public/gui/reference/structree/rows.xml
@@ -6,14 +6,14 @@
 			<repeat count="20" var="s">
 				<object type="image" style="StructBox" name="phase[k]_struct[s]">
 					<object type="text" style="StructNameSpecific" name="phase[k]_struct[s]_name"/>
-					<object type="image" style="StructIcon" name="phase[k]_struct[s]_icon"
+					<object type="button" style="StructIcon" name="phase[k]_struct[s]_icon"
 						sprite="stretched:pregame/shell/logo/wfg_logo_white.png"
 					/>
 					<object name="phase[k]_struct[s]_rows">
 						<repeat count="4" var="r">
 							<object name="phase[k]_struct[s]_row[r]">
 								<repeat count="24" var="p">
-									<object type="image" style="ProdBox" name="phase[k]_struct[s]_row[r]_prod[p]"/>
+									<object type="button" style="ProdBox" name="phase[k]_struct[s]_row[r]_prod[p]"/>
 								</repeat>
 							</object>
 						</repeat>
Index: binaries/data/mods/public/gui/reference/structree/structree.xml
===================================================================
--- binaries/data/mods/public/gui/reference/structree/structree.xml
+++ binaries/data/mods/public/gui/reference/structree/structree.xml
@@ -99,12 +99,12 @@
 				<repeat count="6" var="t">
 					<object type="image" style="StructBox" name="trainer[t]">
 						<object type="text" style="StructNameSpecific" name="trainer[t]_name"/>
-						<object type="image" style="StructIcon" name="trainer[t]_icon"
+						<object type="button" style="StructIcon" name="trainer[t]_icon"
 							sprite="stretched:pregame/shell/logo/wfg_logo_white.png"
 						/>
 						<object name="trainer[t]_row">
 							<repeat count="4" var="p">
-								<object type="image" style="ProdBox" name="trainer[t]_prod[p]"/>
+								<object type="button" style="ProdBox" name="trainer[t]_prod[p]"/>
 							</repeat>
 						</object>
 					</object>
Index: binaries/data/mods/public/gui/reference/viewer/sprites.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/reference/viewer/sprites.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<sprites>
+	<sprite name="IconFrame_Gold">
+		<image
+			border="true"
+			bordercolor="163 163 103"
+			backcolor="0 0 0 0"
+			size="0 0 100% 100%"
+		/>
+		<image
+			border="true"
+			bordercolor="0 0 0"
+			backcolor="0 0 0 0"
+			size="1 1 100%-1 100%-1"
+		/>
+	</sprite>
+</sprites>
Index: binaries/data/mods/public/gui/reference/viewer/styles.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/reference/viewer/styles.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<styles>
+	<style name="IconFrame"
+		sprite="IconFrame_Gold"
+		size="0 0 100% 100%"
+		ghost="true"
+	/>
+
+	<style name="RankGlyph"
+		sprite="stretched:pregame/shell/logo/wfg_logo_white.png"
+		size="4 6 20 22"
+		ghost="true"
+	/>
+
+	<style name="Title"
+		textcolor="white"
+		text_align="center"
+		text_valign="top"
+	/>
+
+	<style name="BodyText"
+		textcolor="white"
+		text_align="left"
+		text_valign="top"
+		scrollbar="true"
+		scrollbar_style="ModernScrollBar"
+	/>
+</styles>
Index: binaries/data/mods/public/gui/reference/viewer/viewer.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/reference/viewer/viewer.js
@@ -0,0 +1,332 @@
+var g_Template = {};
+var g_TemplateLists = {};
+
+/**
+ * Page initialisation. May also eventually pre-draw/arrange objects.
+ *
+ * @param {object} data - Contains the civCode and the name of the template to display.
+ */
+function init (data = null)
+{
+	if (!data || !data.templateName)
+	{
+		error("Viewer: No template provided");
+		closePage();
+		return;
+	}
+
+	if (data.callback)
+		g_CallbackSet = true;
+
+	if (data.civ)
+		g_SelectedCiv = data.civ;
+
+	data.templateName = data.templateName.slice(data.templateName.lastIndexOf("&")+1);
+
+	g_Template = loadTemplateFromName(data.templateName);
+	if (!g_Template)
+	{
+		error("Viewer: unable to recognise or load template (" + data.templateName + ")");
+		closePage();
+		return;
+	}
+
+	init_civs();
+
+	g_TemplateLists = compileTemplateLists(g_SelectedCiv);
+
+	draw();
+}
+
+/**
+ * Populate the UI elements.
+ */
+function draw ()
+{
+	let iconObject = Engine.GetGUIObjectByName("entityIcon")
+	Engine.GetGUIObjectByName("entityName").caption = getEntityNamesFormatted(g_Template);
+	iconObject.sprite = "stretched:session/portraits/" + g_Template.icon;
+
+	let statsObject = Engine.GetGUIObjectByName("entityStats");
+	let statFunctions = [
+		getEntityCostTooltip
+	].concat(g_EntityStatFunctions);
+	statsObject.caption = buildText(g_Template, statFunctions);
+
+	// This is something of a crude hack. Ideally, it would be better to
+	// acquire the height of the rendered text from the text object, but
+	// that is not currently implemented (needs c++ change)
+	let infoObject = Engine.GetGUIObjectByName("entityInfo");
+	let lines = statsObject.caption.split("\n").length;
+	let fontSize = +statsObject.font.substr(statsObject.font.indexOf("-")+1) + 4;
+	let infoSize = infoObject.size;
+	infoSize.top = Math.max(iconObject.size.bottom, lines * fontSize + statsObject.size.top) + 8;
+	infoObject.size = infoSize;
+
+	let infoFunctions = [
+		getEntityTooltip,
+		getHistoryTooltip,
+		getDescriptionTooltip,
+		getAurasTooltip,
+		getVisibleEntityClassesFormatted,
+		getProducedByList,
+		getBuildList,
+		getTrainList,
+		getResearchList,
+		getUpgradeList
+	];
+	infoObject.caption = buildText(g_Template, infoFunctions, "\n\n");
+
+	if (g_Template.promotion)
+		Engine.GetGUIObjectByName("entityRankGlyph").sprite = "stretched:" + getRankGlyph(g_Template.promotion.current_rank);
+	Engine.GetGUIObjectByName("entityRankGlyph").hidden = !(g_Template.promotion);
+}
+
+/**
+ * Determines the requested template and loads it
+ *
+ * @param {string} templateName - The template name. If loading a technology, then `tech/` must be prefixed.
+ * @return {object} The entity object.
+ */
+function loadTemplateFromName(templateName)
+{
+	if (templateName.indexOf("|") > -1)
+		templateName = templateName.slice(templateName.indexOf("|")+1);
+
+	if (g_ParsedData[templateName])
+		return g_ParsedData[templateName];
+
+	let template;
+	switch (getTypeFromName(templateName))
+	{
+	case "structure":
+		template = loadStructure(templateName);
+		break;
+
+	case "unit":
+		template = loadUnit(templateName);
+		break;
+
+	case "resource":
+		template = loadResource(templateName);
+		break;
+
+	case "tech":
+		template = loadTechnology(templateName.substr(templateName.indexOf("/")+1));
+		break;
+
+	default:
+		// do nothing (error message is given elsewhere)
+	}
+
+	g_ParsedData[templateName] = template;
+
+	return template;
+}
+
+/**
+ * @param {string} templateName
+ * @return {string} Type of template
+ */
+function getTypeFromName(templateName)
+{
+	if (templateName.indexOf("|") > -1)
+		templateName = templateName.slice(templateName.indexOf("|")+1);
+	let prefix = templateName.slice(0, templateName.indexOf("/"));
+
+	if (prefix == "other")
+	{
+		// Sea-based treasures are in `other/` instead of `gaia/` with the rest of the treasures.
+		if (templateName.startsWith("other/special_treasure"))
+			return "resource";
+
+		// Catafalques should be loaded with loadUnit().
+		if (templateName.startsWith("other/catafalque"))
+			return "unit";
+
+		return "structure";
+	}
+
+	let dict = {
+		"structures": "structure",
+		"units": "unit",
+		"gaia": "resource",
+		"tech": "tech"
+	};
+
+	return dict[prefix] || false;
+}
+
+/**
+ * Overrides near-identical function in gui/common/tooltips.js
+ * (Just so we can get slightly bigger text)
+ */
+function getEntityNamesFormatted(template)
+{
+	let names = "";
+	let generic = template.name.generic;
+	let specific = template.name.specific;
+	if (specific)
+	{
+		// drop caps for specific name
+		names += '[font="sans-bold-20"]' + specific[0] + '[/font]' +
+			'[font="sans-bold-16"]' + specific.slice(1).toUpperCase() + '[/font]';
+
+		if (generic)
+			names += '[font="sans-bold-16"] (' + generic + ')[/font]';
+	}
+	else if (generic)
+		names = '[font="sans-bold-20"]' + generic + "[/font]";
+	else
+		names = "???";
+
+	return names;
+}
+
+/**
+ * @param {object} template
+ * @return {string} List of the names of all the buildings/units that build/train/research the selected template.
+ */
+function getProducedByList(template)
+{
+	if (g_SelectedCiv == "gaia")
+		return "";
+
+	let builders = [];
+	let buildCaption = "";
+	switch (getTypeFromName(template.name.internal))
+	{
+
+	case "structure":
+		if (!g_TemplateLists.structures.has(template.name.internal))
+			// Wall towers and gates are not built directly by anything,
+			// thus they won't exist in the Map.
+			return "";
+		builders = g_TemplateLists.structures.get(template.name.internal);
+		buildCaption = translate("Built by:");
+		break;
+
+	case "unit":
+		builders = g_TemplateLists.units.get(template.name.internal);
+		buildCaption = translate("Trained at:");
+		break;
+
+	case "tech":
+	{
+		let templateName = template.name.internal;
+		builders = g_TemplateLists.techs.get(templateName.substr(templateName.indexOf("/")+1));
+		buildCaption = translate("Researched at:");
+		break;
+	}
+
+	}
+
+	// This can happen, for example with catafalques which cannot be built/trained.
+	if (!builders)
+		return "";
+
+	let builderText = [];
+	for (let builder of builders)
+		builderText.push(getEntityNames(loadTemplateFromName(builder)));
+
+	return sprintf(translate("%(listHeader)s %(listOfNames)s"), {
+		"listHeader": headerFont(buildCaption),
+		"listOfNames": bodyFont(builderText.join(translate(", ")))
+	});
+}
+
+/**
+ * @param {object} template
+ * @return {string} List of the names of the buildings the selected unit can build.
+ */
+function getBuildList(template)
+{
+	if (!template.builder || !template.builder.length)
+		return "";
+
+	let builds = [];
+	for (let prod of template.builder)
+		builds.push(getEntityNames(loadStructure(prod)));
+
+	return sprintf(translate("%(listHeader)s %(listOfNames)s"), {
+		"listHeader": headerFont(translate("Builds:")),
+		"listOfNames": bodyFont(builds.join(translate(", ")))
+	});
+}
+
+/**
+ * @param {object} template
+ * @return {string} List of the names of the technologies the selected structure/unit can research.
+ */
+function getResearchList(template)
+{
+	if (!template.production || !template.production.technology || !template.production.technology.length)
+		return "";
+
+	let builds = [];
+	for (let prod of template.production.technology)
+	{
+		let research = loadTechnology(prod);
+		if (research.reqs)
+			builds.push(getEntityNames(research));
+	}
+
+	return sprintf(translate("%(listHeader)s %(listOfNames)s"), {
+		"listHeader": headerFont(translate("Researches:")),
+		"listOfNames": bodyFont(builds.join(translate(", ")))
+	});
+}
+
+/**
+ * @param {object} template
+ * @return {string} List of the names of the units the selected unit can train.
+ */
+function getTrainList(template)
+{
+	if (!template.production || !template.production.units || !template.production.units.length)
+		return "";
+
+	let builds = [];
+	for (let prod of template.production.units)
+		builds.push(getEntityNames(loadUnit(prod)));
+
+	return sprintf(translate("%(listHeader)s %(listOfNames)s"), {
+		"listHeader": headerFont(translate("Trains:")),
+		"listOfNames": bodyFont(builds.join(translate(", ")))
+	});
+}
+
+/**
+ * @param {object} template
+ * @return {string} List of the names of the buildings/units the selected structure/unit can upgrade to.
+ */
+function getUpgradeList(template)
+{
+	if (!template.upgrades)
+		return "";
+
+	let builds = [];
+	for (let prod of template.upgrades)
+		builds.push(getEntityNames(prod));
+
+	return sprintf(translate("%(listHeader)s %(listOfNames)s"), {
+		"listHeader": headerFont(translate("Upgradable to:")),
+		"listOfNames": bodyFont(builds.join(translate(", ")))
+	});
+}
+
+/**
+ * Returns the appropriate promotion rank glyph for a given rank
+ *
+ * TODO: Don't hardcode ranks.
+ *
+ * @param {string} rank
+ * @return {string} Path to the image.
+ */
+function getRankGlyph(rank)
+{
+	let ranks = [ "Basic", "Advanced", "Elite" ];
+	if (!ranks.indexOf(rank) < 0)
+		return null;
+	return "session/icons/rank" + (ranks.indexOf(rank) + 1) + ".png";
+}
Index: binaries/data/mods/public/gui/reference/viewer/viewer.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/reference/viewer/viewer.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<objects>
+	<script file="gui/common/functions_civinfo.js"/>
+	<script file="gui/common/functions_utility.js"/>
+	<script file="gui/common/tooltips.js"/>
+	<script directory="gui/reference/common/"/>
+	<script file="gui/reference/viewer/viewer.js"/>
+
+	<!-- Add a translucent black background to fade out whatever's behind this -->
+	<object type="image" z="0" sprite="BackgroundTranslucent"/>
+
+	<object type="image" sprite="ModernDialogNoTitle" size="50%-250 50%-300 50%+250 50%+300">
+
+		<object name="entityName" type="text" style="Title" size="8 12 100%-8 48"/>
+
+		<object name="entityIcon" type="image"
+			size="16 48 128+16 128+48"
+			sprite="stretched:pregame/shell/logo/wfg_logo_white.png"
+		>
+			<object type="image" style="IconFrame"/>
+			<object type="image" style="RankGlyph" name="entityRankGlyph"/>
+		</object>
+
+		<object name="entityStats" type="text" style="BodyText" size="128+20 44 100%-8 50%"/>
+
+		<object name="entityInfo" type="text" style="BodyText" size="16 128+48+8 100%-16 100%-48"/>
+
+		<!-- Close page -->
+		<object
+			type="button"
+			style="StoneButton"
+			size="100%-164 100%-44 100%-16 100%-16"
+			hotkey="cancel"
+		>
+			<translatableAttribute id="caption">Close</translatableAttribute>
+			<action on="Press"><![CDATA[
+				closePage();
+			]]></action>
+		</object>
+	</object>
+
+</objects>
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
@@ -302,6 +302,8 @@
 
 	// TODO: we should require all entities to have icons
 	Engine.GetGUIObjectByName("icon").sprite = template.icon ? ("stretched:session/portraits/" + template.icon) : "BackgroundBlack";
+	if (template.icon)
+		Engine.GetGUIObjectByName("iconBorder").onpressright = function () { showTemplateDetails(entState.template, playerState.civ); };
 
 	Engine.GetGUIObjectByName("attackAndArmorStats").tooltip = [
 		getAttackTooltip,
@@ -326,7 +328,8 @@
 	iconTooltips = iconTooltips.concat([
 		getVisibleEntityClassesFormatted,
 		getAurasTooltip,
-		getEntityTooltip
+		getEntityTooltip,
+		getRightClickMessage
 	].map(func => func(template)));
 
 	Engine.GetGUIObjectByName("iconBorder").tooltip = iconTooltips.filter(tip => tip).join("\n");
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
@@ -262,6 +262,7 @@
 			template.auras = GetTemplateData(template.wallSet.templates.long).auras;
 
 		data.button.onPress = function () { startBuildingPlacement(data.item, data.playerState); };
+		data.button.onPressRight = function () { showTemplateDetails(data.item, data.playerState.civ); };
 
 		let tooltips = [
 			getEntityNamesFormatted,
@@ -270,7 +271,8 @@
 			getEntityTooltip,
 			getEntityCostTooltip,
 			getGarrisonTooltip,
-			getPopulationBonusTooltip
+			getPopulationBonusTooltip,
+			getRightClickMessage
 		].map(func => func(template));
 
 		let limits = getEntityLimitAndCount(data.playerState, data.item);
@@ -760,7 +762,8 @@
 			let tooltips = [
 				getEntityNamesFormatted,
 				getEntityTooltip,
-				getEntityCostTooltip
+				getEntityCostTooltip,
+				getRightClickMessage
 			].map(func => func(template));
 
 			if (!requirementsPassed)
@@ -811,6 +814,8 @@
 				addResearchToQueue(data.item.researchFacilityId, tech);
 			};
 
+			button.onPressRight = function () { showTemplateDetails("tech/"+data.item.tech, data.playerState.civ); };
+
 			if (data.item.tech.pair)
 			{
 				// On mouse enter, show a cross over the other icon
@@ -998,6 +1003,7 @@
 		data.button.onPress = function() {
 			addTrainingToQueue(data.unitEntStates.map(state => state.id), data.item, data.playerState);
 		};
+		data.button.onPressRight = function () { showTemplateDetails(data.item, data.playerState.civ); };
 
 		data.countDisplay.caption = trainNum > 1 ? trainNum : "";
 
@@ -1023,7 +1029,8 @@
 				getArmorTooltip,
 				getGarrisonTooltip,
 				getProjectilesTooltip,
-				getSpeedTooltip
+				getSpeedTooltip,
+				getRightClickMessage
 			].map(func => func(template)));
 
 		tooltips.push(
@@ -1121,7 +1128,8 @@
 				getEntityCostTooltip(data.item),
 				formatLimitString(limits.entLimit, limits.entCount, limits.entLimitChangers),
 				getRequiredTechnologyTooltip(technologyEnabled, data.item.requiredTechnology, GetSimState().players[data.player].civ),
-				getNeededResourcesTooltip(neededResources));
+				getNeededResourcesTooltip(neededResources),
+				getRightClickMessage());
 
 			tooltip = tooltips.filter(tip => tip).join("\n");
 
@@ -1140,6 +1148,8 @@
 		data.button.enabled = controlsPlayer(data.player);
 		data.button.tooltip = tooltip;
 
+		data.button.onPressRight = function () { showTemplateDetails(data.item.entity, data.playerState.civ); };
+
 		let modifier = "";
 		if (!isUpgrading)
 		{
@@ -1177,6 +1187,20 @@
 };
 
 /**
+ * Pauses game and opens the entity details viewer on a given entity
+ */
+function showTemplateDetails(templateName, civ = "athen")
+{
+	pauseGame();
+	let data = {
+		"templateName" : templateName,
+		"callback": "resumeGame",
+		"civ": civ,
+	};
+	Engine.PushGuiPage("page_viewer.xml", data);
+}
+
+/**
  * If two panels need the same space, so they collide,
  * the one appearing first in the order is rendered.
  *
Index: binaries/data/mods/public/gui/session/selection_panels_helpers.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_helpers.js
+++ binaries/data/mods/public/gui/session/selection_panels_helpers.js
@@ -84,6 +84,11 @@
 	}
 }
 
+function getRightClickMessage()
+{
+	return translate("Right-click for more information.");
+}
+
 /**
  * Format entity count/limit message for the tooltip
  */
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
@@ -67,7 +67,7 @@
 		</object>
 
 		<!-- Big unit icon -->
-		<object size="-8 -8 88 88" type="image" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
+		<object size="-8 -8 88 88" 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 -->
Index: binaries/data/mods/public/l10n/messages.json
===================================================================
--- binaries/data/mods/public/l10n/messages.json
+++ binaries/data/mods/public/l10n/messages.json
@@ -243,6 +243,7 @@
                     "gui/pregame/**.js",
                     "gui/reference/common/**.js",
                     "gui/reference/structree/**.js",
+                    "gui/reference/viewer/**.js",
                     "gui/replaymenu/**.js",
                     "gui/savedgames/**.js",
                     "gui/splashscreen/**.js",
@@ -277,6 +278,7 @@
                     "gui/options/**.xml",
                     "gui/pregame/**.xml",
                     "gui/reference/structree/**.xml",
+                    "gui/reference/viewer/**.xml",
                     "gui/replaymenu/**.xml",
                     "gui/savedgames/**.xml",
                     "gui/splashscreen/**.xml",
@@ -386,6 +388,7 @@
                     "keywords": {
                         "GenericName": {},
                         "SpecificName": {},
+                        "History": {},
                         "VisibleClasses": {
                             "splitOnWhitespace": true
                         },
@@ -417,6 +420,7 @@
                     "keywords": {
                         "GenericName": {},
                         "SpecificName": {},
+                        "History": {},
                         "VisibleClasses": {
                             "splitOnWhitespace": true
                         },
@@ -455,6 +459,7 @@
                     "keywords": {
                         "GenericName": {},
                         "SpecificName": {},
+                        "History": {},
                         "VisibleClasses": {
                             "splitOnWhitespace": true
                         },