diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 3b26bc48a7b6f20d5b45257f8700f632dd11323e..f74359b4764d39c527c1a5e7d6fe3ad178ec6e3b 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -90,94 +90,75 @@
 <<capture _ssi>>
 
 <<if $useSlaveListInPageJSNavigation == 1>>
-        <<set _Count = _indexSlavesIdxs.length>>
-        <<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag)) || ($Flag == 1)))>>
-                <<set _indexed = 1, _counter = 0, _buttons = []>>
-<style>
-        .hidden {   display:none;   }
-
-        table.quicklist {
-                table-layout: fixed;
-                text-align: center;
-                border-collapse: separate;
-                border-spacing: 2px;
-                border-style: hidden;
-                empty-cells: hide;
-                width: 70%;
-        }
-        table.quicklist td  { margin: 1px; }
-        table.quicklist col { width: 8%; }
-        table.quicklist td  { border: 5px solid blue; }
-</style>
-<br />
-<button data-quick-index="1">Quick Index</button>
-<div id="list_index" class="hidden">
-                <<for !_.isUndefined(_ssii = _indexSlavesIdxs.shift())>>
-                        <<set _IndexSlave = $slaves[_ssii]>>
-                        <<if $surnameOrder != 1>>
-                                <<if ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(_Slave.nationality)>>
-                                        <<set _indexSlaveName = [_IndexSlave.slaveSurname || "", _IndexSlave.slaveName].join(" ").trim()>>
-                                <<else>>
-                                        <<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
-                                <</if>>
-                        <<else>>
-                                <<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
-                        <</if>>
-                        <<set _buttons.push('<button data-scroll-to="#slave-' + _IndexSlave.ID + '" data-scroll-offset="300">' + _indexSlaveName + '</button>'); >>
-                <</for>>
-                <<set _button = _buttons.shift()>>
-                <<if !_.isUndefined(_button)>>
-                        <<set _buttons.unshift(_button);>>
-        <table class="quicklist">
-                        <<for !_.isUndefined(_button = _buttons.shift())>>
-                                <<set _buttons.unshift(_button);>>
-                <tr>
-                                <<for _cols = 0; _cols <= 4; _cols++>>
-                                        <<set _button = _buttons.shift()>>
-                                        <<if !_.isUndefined(_button)>>
-                        <td></td>
-                        <td colspan="2">
-                                                <<print _button>>
-                        </td>
-                                        <</if>>
-                                <</for>>
-                        <td></td>
-                </tr>
-                        <</for>>
-        </table>
-        <script>
-            /*
-            *   Use javascript scrollTop animation for in page navigation.
-            */
-            $("[data-quick-index]")
-                .click(
-                    function ()
-                    {
-                        var     $quick  =   $('div#list_index')
-                            ;
-                        $quick.toggleClass("hidden");
-                    }
-                );
-            $("[data-scroll-to]")
-                .click(
-                    function ()
-                    {
-                        var     $this       =   $(this);
-                        var     $toElement  =   $this.attr('data-scroll-to')
-                            ,   $offset     =   $this.attr('data-scroll-offset')    * 1 ||  0
-                            ,   $speed      =   $this.attr('data-scroll-speed')     * 1 ||  900
-                            ;
-                        $('html, body')
-                            .animate(
-                                { scrollTop: $($toElement).offset().top + $offset },
-                                $speed
-                            );
-                    }
-                );
-        </script>
-                <</if>>
-</div>
-        <</if>>
+	<<set _Count = _indexSlavesIdxs.length>>
+	<<if ((_Count > 1) && (_indexed == 0) && (((_Pass == 'Main') && (ndef $Flag)) || ($Flag == 1)))>>
+		<<set _indexed = 1, _counter = 0, _buttons = []>>
+		<style>
+			.hidden {display:none;}
+			table.quicklist {
+				table-layout: fixed;
+				text-align: center;
+				border-collapse: separate;
+				border-spacing: 2px;
+				border-style: hidden;
+				empty-cells: hide;
+				width: 70%;
+			}
+			table.quicklist td  { margin: 1px; }
+			table.quicklist col { width: 8%; }
+		</style>
+		<br />
+		<button data-quick-index="1">Quick Index</button>
+		<div id="list_index" class="hidden">
+		<<for !_.isUndefined(_ssii = _indexSlavesIdxs.shift())>>
+			<<set _IndexSlave = $slaves[_ssii]>>
+			<<if $surnameOrder != 1>>
+				<<if ["Cambodian", "Chinese", "Hungarian", "Japanese", "Korean", "Mongolian", "Taiwanese", "Vietnamese"].includes(_Slave.nationality)>>
+					<<set _indexSlaveName = [_IndexSlave.slaveSurname || "", _IndexSlave.slaveName].join(" ").trim()>>
+				<<else>>
+					<<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
+				<</if>>
+			<<else>>
+				<<set _indexSlaveName = [_IndexSlave.slaveName, _IndexSlave.slaveSurname || ""].join(" ").trim()>>
+			<</if>>
+			<<set _buttons.push('<button data-scroll-to="#slave-' + _IndexSlave.ID + '" data-scroll-offset="300">' + _indexSlaveName + '</button>'); >>
+		<</for>>
+		<<if !_.isUndefined(_buttons[0])>>
+			<table class="quicklist">
+			<<for !_.isUndefined(_buttons[0])>>
+				<tr>
+					<<for _cols = 0; _cols <= 4; _cols++>>
+						<<set _button = _buttons.shift()>>
+						<<if !_.isUndefined(_button)>>
+							<td></td>
+							<td colspan="10">
+								<<print _button>>
+							</td>
+						<</if>>
+					<</for>>
+					<td></td>
+				</tr>
+			<</for>>
+			</table>
+			<script>
+				/*
+				*   Use javascript scrollTop animation for in page navigation.
+				*/
+				$("[data-quick-index]").click(function() {
+					var $quick = $('div#list_index');
+					$quick.toggleClass("hidden");
+				});
+				$("[data-scroll-to]").click(function() {
+					var $this = $(this);
+					var $toElement = $this.attr('data-scroll-to'), $offset = $this.attr('data-scroll-offset') || 0, $speed = $this.attr('data-scroll-speed') || 900;
+					$('html, body').animate( {
+						scrollTop: $($toElement).offset().top + $offset
+					}, $speed);
+				});
+			</script>
+		<</if>>
+		</div>
+	<</if>>
 <</if>>
 <<switch _Pass>>
 <<case "Main">>
@@ -232,7 +213,7 @@
 	<<elseif "guard you" == _Slave.assignment>>''@@.lightcoral;BG@@''
 	<</if>>
 	<<if Array.isArray($personalAttention) && $personalAttention.findIndex(function(s) { return s.ID == _Slave.ID; }) != -1>>''@@.lightcoral;PA@@''<</if>>
-        <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+	<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 	[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]] /* lists their names */
 
 <<case "Personal Attention Select">>
@@ -268,11 +249,10 @@
 <<case "Head Girl Suite">>
 <<if $Flag == 0>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Subordinate Targeting">>
@@ -284,7 +264,6 @@
 	<<if (_Slave.health < 20) || (_Slave.trust < 60) || (_Slave.devotion <= 60) || (_Slave.fetish == "mindbroken") || _Slave.sexualFlaw !== "none" || _Slave.behavioralFlaw !== "none">>
 	<<if _Slave.devotion >= -20 || _Slave.fetish == "mindbroken">>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 	<<else>>
 		<br>//_Slave.slaveName cannot be trusted in the spa//
@@ -296,10 +275,11 @@
 	<</if>>
 <<elseif $Flag == 1>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
-                <<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Attendant Select">>
 	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -310,7 +290,6 @@
 	<<if _Slave.breedingMark != 1>>
 	<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 	<<else>>
 		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
@@ -322,10 +301,11 @@
 	<</if>>
 <<elseif $Flag == 1>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
-		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>><<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+		<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Madam Select">>
 	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -336,8 +316,7 @@
 	<<if _Slave.breedingMark != 1>>
 	<<if (_Slave.devotion > 50) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50) || (_Slave.trust > 50)>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
-		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+ 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 	<<else>>
 		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
 		<<continue>>
@@ -348,11 +327,10 @@
 	<</if>>
 <<elseif $Flag == 1>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "DJ Select">>
@@ -363,7 +341,6 @@
 	<<if $clinic <= $clinicSlaves>><<continue>><</if>>
 	<<if (_Slave.health < 20) || ($Nurse != 0 && (_Slave.chem > 15 && $clinicUpgradeFilters == 1) || ($bellyImplants == 1 && _Slave.bellyImplant > -1) || (_Slave.pregKnown == 1 && ($clinicSpeedGestation >= 0 || _Slave.pregControl == "speed up")))>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 	<<else>>
 		<br>//_Slave.slaveName cannot benefit from the clinic//
@@ -371,12 +348,11 @@
 	<</if>>
 <<elseif $Flag == 1>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
-		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+ 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Nurse Select">>
 	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -387,8 +363,7 @@
 	<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
 		<<if (_Slave.intelligenceImplant < 1) || (_Slave.voice != 0 && _Slave.accent+$schoolroomUpgradeLanguage > 2) || (_Slave.oralSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.whoreSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.entertainSkill <= 10+$schoolroomUpgradeSkills*20) || (_Slave.analSkill < 10+$schoolroomUpgradeSkills*20) || ((_Slave.vagina >= 0) && (_Slave.vaginalSkill < 10+$schoolroomUpgradeSkills*20))>>
 			<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                        <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
-			[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+ 			[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 		<<else>>
 			<br>//_Slave.slaveName already has a basic education//
 			<<continue>>
@@ -399,11 +374,10 @@
 	<</if>>
 <<elseif $Flag == 1>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Schoolteacher Select">>
@@ -432,7 +406,6 @@
 				<<if ($dairyStimulatorsSetting < 2) || (_Slave.anus > 2) || ($dairyPrepUpgrade == 1)>>
 					<<if ($dairyPregSetting < 2) || (_Slave.vagina > 2) || (_Slave.ovaries == 0) || ($dairyPrepUpgrade == 1)>>
 						<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                                                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 						[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 						<<else>>
 							<br>//_Slave.slaveName's vagina cannot accommodate current machine settings//
@@ -456,11 +429,10 @@
 	<</if>>
 <<elseif $Flag == 1>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Milkmaid Select">>
@@ -471,7 +443,6 @@
 	<<if $servantsQuarters <= $servantsQuartersSlaves>><<continue>><</if>>
 	<<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 	<<else>>
 		<br>//_Slave.slaveName must be either more fearful of you or devoted to you//
@@ -479,11 +450,10 @@
 	<</if>>
 <<elseif $Flag == 1>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Stewardess Select">>
@@ -493,8 +463,7 @@
 <<if $Flag == 0>>
 	<<if $masterSuite <= $masterSuiteSlaves>><<continue>><</if>>
 	<<if (_Slave.devotion > 20) || ((_Slave.devotion >= -50) && (_Slave.trust < -20)) || (_Slave.trust < -50)>>
-		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 	<<else>>
 		<br>//_Slave.slaveName is not sufficiently broken for the master suite//
@@ -502,11 +471,10 @@
 	<</if>>
 <<elseif $Flag == 1>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Concubine Select">>
@@ -518,7 +486,6 @@
 	<<if $cellblock <= $cellblockSlaves>><<continue>><</if>>
 	<<if (_Slave.devotion < -20 && _Slave.trust >= -20) || (_Slave.devotion < -50 && _Slave.trust >= -50)>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 	<<else>>
 		<br>//_Slave.slaveName is sufficiently broken in so that the cellblock would have no effect//
@@ -526,11 +493,10 @@
 	<</if>>
 <<elseif $Flag == 1>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <<else>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Wardeness Select">>
@@ -543,7 +509,6 @@
 	<<if _Slave.breedingMark != 1>>
 	<<if (_Slave.indentureRestrictions <= 0)>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 	<<else>>
 		<br>//_Slave.slaveName's indenture forbids arcade service.//
@@ -555,7 +520,7 @@
 	<</if>>
 <<else>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-                <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+		<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 		[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</if>>
 <<case "Pit">>
@@ -570,8 +535,8 @@
 		<br>//_Slave.slaveName may not participate in combat//
 		<<continue>>
 	<<else>>
-				<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-				[[_slaveName|Assign][$i = _ssi]]
+		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
+		[[_slaveName|Assign][$i = _ssi]]
 	<</if>>
 <<else>>
 		<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
@@ -609,7 +574,7 @@
 <</if>>
 <<case "Matchmaking">>
 	<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
-        <<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
+	<<print '<a id="slave-' + $slaves[_ssi].ID + '"></a>'>>
 	[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
 <</switch>>