diff --git a/binaries/data/mods/public/gui/session_new/unit_commands.js b/binaries/data/mods/public/gui/session_new/unit_commands.js
index df806e0ed5..00b486fd94 100644
--- a/binaries/data/mods/public/gui/session_new/unit_commands.js
+++ b/binaries/data/mods/public/gui/session_new/unit_commands.js
@@ -362,7 +362,7 @@ function updateUnitCommands(entState, supplementalDetailsPanel, commandsPanel, s
 
 
 		var formations = getEntityFormationsList(entState);
-		if (formations.length)
+		if (isUnit(entState) && !isAnimal(entState) && formations.length)
 			setupUnitPanel("Formation", usedPanels, entState, formations,
 				function (item) { performFormation(entState.id, item); } );
 
diff --git a/binaries/data/mods/public/gui/session_new/utility_functions.js b/binaries/data/mods/public/gui/session_new/utility_functions.js
index 0790594a3f..b310da4b49 100644
--- a/binaries/data/mods/public/gui/session_new/utility_functions.js
+++ b/binaries/data/mods/public/gui/session_new/utility_functions.js
@@ -73,12 +73,38 @@ function isUnit(entState)
 		var classes = entState.identity.classes;
 		if (classes && classes.length)
 			for (var i = 0; i < classes.length; i++)
-				if ((classes[i] == "Organic") || (classes[i] == "Mechanical"))
+				if (classes[i] == "Unit")
 					return true;
 	}
 	return false;
 }
 
+function isAnimal(entState)
+{
+	if (entState.identity)
+	{
+		var classes = entState.identity.classes;
+		if (classes && classes.length)
+		for (var i = 0; i < classes.length; i++)
+			if (classes[i] == "Animal")
+				return true;
+	}
+	return false;
+}
+
+function isStructure(entState)
+{
+	if (entState.identity)
+	{
+		var classes = entState.identity.classes;
+		if (classes && classes.length)
+		for (var i = 0; i < classes.length; i++)
+			if (classes[i] == "Structure")
+				return true;
+	}
+	return false;
+}
+
 function isDefensive(entState)
 {
 	if (entState.identity)
diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js
index 8381537e0c..894148fef0 100644
--- a/binaries/data/mods/public/simulation/components/Identity.js
+++ b/binaries/data/mods/public/simulation/components/Identity.js
@@ -60,12 +60,14 @@ Identity.prototype.Schema =
 			"<list>" +
 				"<zeroOrMore>" +
 					"<choice>" +
-						"<value>Organic</value>" +
+						"<value>Unit</value>" +
 						"<value>Foot</value>" +
 						"<value>Mounted</value>" +
 						"<value>Mechanical</value>" +
 						"<value>Super</value>" +
 						"<value>Hero</value>" +
+						"<value>Animal</value>" +
+						"<value>Organic</value>" +
 						"<value>Structure</value>" +
 						"<value>Civic</value>" +
 						"<value>Economic</value>" +
diff --git a/binaries/data/mods/public/simulation/templates/template_structure.xml b/binaries/data/mods/public/simulation/templates/template_structure.xml
index a376637812..b000e51fed 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -2,10 +2,7 @@
 <Entity parent="template_entity_full">
   <Identity>
     <GenericName>Structure</GenericName>
-    <Classes datatype="tokens">
-      Structure
-      ConquestCritical
-    </Classes>
+    <Classes datatype="tokens">Structure ConquestCritical</Classes>
     <IconSheet>snPortraitSheetBuildings</IconSheet>
   </Identity>
   <BuildRestrictions>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index e01bc2392c..2114e20c31 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -2,9 +2,7 @@
 <Entity parent="template_entity_full">
   <Identity>
     <GenericName>Unit</GenericName>
-    <Classes datatype="tokens">
-      ConquestCritical
-    </Classes>
+    <Classes datatype="tokens">Unit ConquestCritical</Classes>
   </Identity>
   <Minimap>
     <Type>unit</Type>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
index 43bfc92003..a794c58df9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit">
   <Identity>
     <GenericName>Fauna</GenericName>
-	<Classes datatype="tokens">Organic</Classes>
+	<Classes datatype="tokens">Animal Organic</Classes>
     <IconSheet>snPortraitSheetAnimalGaia</IconSheet>
     <IconCell>0</IconCell>
   </Identity>