diff --git a/src/Mods/SpecialForce/Firebase.tw b/src/Mods/SpecialForce/Firebase.tw
index f337cb84471fbfa63053c7548f62156b38774921..3cf2bc20843711e192e31681eb434b659e6f1368 100644
--- a/src/Mods/SpecialForce/Firebase.tw
+++ b/src/Mods/SpecialForce/Firebase.tw
@@ -61,6 +61,7 @@
 				<</if>>
 				<br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1]]
 				<br>[[Request she remain on site|Firebase][$SF.MercCon.CanAttend = -2]]
+				<br>
 			<</if>>
 
 			<span id="result0">
@@ -71,29 +72,31 @@
 					<br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print num($SF.MercCon.TotalMenials)>> menial slaves and <<print num($SF.MercCon.TotalMercs)>> mercenaries joined across $SF.MercCon.History meetups. <<link "Back" "Firebase">> <</link>>
 					<</replace>>
 				<</link>>
+				<br><br>
 			<</if>>
 			</span>
 
-			<<if $SF.UC.Lock < 1>> <br>
+			<<if $SF.UC.Lock < 1>>
 				<<switch $SF.UC.Assign>>
 				<<case 0>>
-					<br>No soldiers are working undercover, which would primarily advance your cultural goals while also slightly boosting your reputation.
+					No soldiers are working undercover, which would primarily advance your cultural goals while also slightly boosting your reputation.
 					<br>[[Full time assignment|Firebase][$SF.UC.Lock = 1]]
 					<br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]]
 				<<case 1>>
-					<br>A small section of soldiers are working undercover, which will primarily advance your cultural goals while also slightly boosting your reputation. [[Full time assignment|Firebase][$SF.UC.Lock = 1]]
+					A small section of soldiers are working undercover, which will primarily advance your cultural goals while also slightly boosting your reputation. [[Full time assignment|Firebase][$SF.UC.Lock = 1]]
 					<br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]]
 				<<case 2>>
-					<br>A large section of soldiers are working undercover, which will primarily advance your cultural goals while also slightly boosting your reputation. [[Full time assignment|Firebase][$SF.UC.Lock = 1]]
+					A large section of soldiers are working undercover, which will primarily advance your cultural goals while also slightly boosting your reputation. [[Full time assignment|Firebase][$SF.UC.Lock = 1]]
 					<br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]]
 				<<default>>
-					<br>Would you like to assign soldiers to undercover duty, which will primarily advance your cultural goals while also slightly boosting your reputation?
+					Would you like to assign soldiers to undercover duty, which will primarily advance your cultural goals while also slightly boosting your reputation?
 					<br>[[Do not assign soldiers to work undercover|Firebase][$SF.UC.Assign = 0]]
 					<br>[[Assign a small section of soldiers to work undercover|Firebase][$SF.UC.Assign = 1]]
 					<br>[[Assign a large section of soldiers to work undercover|Firebase][$SF.UC.Assign = 2]]
 				<</switch>>
 			<<else>>
-				<br> <<if $SF.UC.Assign < 1>>''Zero''<<elseif $SF.UC.Assign < 2>>A ''small'' section<<else>>A ''large'' section<</if>> of the special force is assigned to undercover work, which will primarily advance your cultural goals while also slightly boosting your reputation. [[Re-allocate the units|Firebase][$SF.UC.Lock = 0]]
+				<<if $SF.UC.Assign < 1>>''Zero''<<elseif $SF.UC.Assign < 2>>A ''small'' section<<else>>A ''large'' section<</if>> 
+				of the special force is assigned to undercover work, which will primarily advance your cultural goals while also slightly boosting your reputation. [[Re-allocate the units|Firebase][$SF.UC.Lock = 0]]
 			<</if>>
 
 			<<if $SF.Squad.Firebase > 5 && $secExpEnabled > 0 && $SecExp.edicts.SFSupportLevel >= 4 && App.SecExp.battle.maxUnits() === 18 && App.SecExp.battle.deploySpeed() <= 10>>
diff --git a/src/Mods/SpecialForce/SpecialForce.js b/src/Mods/SpecialForce/SpecialForce.js
index a1065f6e724059142de128822cdd975b0c3d6354..3fa2bdf88e98542cbe94213bcf39473820967847 100644
--- a/src/Mods/SpecialForce/SpecialForce.js
+++ b/src/Mods/SpecialForce/SpecialForce.js
@@ -42,7 +42,7 @@ App.SF.unlocked = (function() {
 
 	function secondTier() {
 		return V.SF.Squad.Firebase + V.SF.Squad.Armoury + V.SF.Squad.Drugs + V.SF.Squad.Drones
-		+ V.SF.Squad.AV + V.SF.Squad.TV + V.SF.Squad.AA + V.SF.Squad.TA >= 30;
+		+ ((V.SF.Squad.AV + V.SF.Squad.TV) || (V.SF.Squad.AA + V.SF.Squad.TA)) >= 30;
 	}
 
 	function garage(mode = 'standard') {