diff --git a/src/mission/imap/+mag/+imap/+view/Field.m b/src/mission/imap/+mag/+imap/+view/Field.m
index ddb0138..9d14e73 100644
--- a/src/mission/imap/+mag/+imap/+view/Field.m
+++ b/src/mission/imap/+mag/+imap/+view/Field.m
@@ -42,9 +42,11 @@ function visualize(this)
                 this.Figures = this.Factory.assemble( ...
                     scienceData{:}, ...
                     eventData{:}, ...
+                    pwrHK, [mag.graphics.style.Default(Title = compose("%s & ICU Temperatures", primarySensor), YLabel = this.TLabel, Legend = [primarySensor, "ICU"], Charts = mag.graphics.chart.Plot(YVariables = [primarySensor, "ICU"] + "Temperature")), ...
+                    mag.graphics.style.Default(Title = compose("%s & ICU Temperatures", secondarySensor), YLabel = this.TLabel, YAxisLocation = "right", Legend = [secondarySensor, "ICU"], Charts = mag.graphics.chart.Plot(YVariables = [secondarySensor, "ICU"] + "Temperature"))], ...
                     Title = this.getFigureTitle(primary, secondary), ...
                     Name = this.getFigureName(primary, secondary), ...
-                    Arrangement = [3 + numEvents, numScience], ...
+                    Arrangement = [4 + numEvents, numScience], ...
                     LinkXAxes = true, ...
                     WindowState = "maximized");
             else
@@ -52,11 +54,9 @@ function visualize(this)
                 this.Figures = this.Factory.assemble( ...
                     scienceData{:}, ...
                     eventData{:}, ...
-                    pwrHK, [mag.graphics.style.Default(Title = compose("%s & ICU Temperatures", primarySensor), YLabel = this.TLabel, Legend = [primarySensor, "ICU"], Charts = mag.graphics.chart.Plot(YVariables = [primarySensor, "ICU"] + "Temperature")), ...
-                    mag.graphics.style.Default(Title = compose("%s & ICU Temperatures", secondarySensor), YLabel = this.TLabel, YAxisLocation = "right", Legend = [secondarySensor, "ICU"], Charts = mag.graphics.chart.Plot(YVariables = [secondarySensor, "ICU"] + "Temperature"))], ...
                     Title = this.getFigureTitle(primary, secondary), ...
                     Name = this.getFigureName(primary, secondary), ...
-                    Arrangement = [4 + numEvents, numScience], ...
+                    Arrangement = [3 + numEvents, numScience], ...
                     LinkXAxes = true, ...
                     WindowState = "maximized");
             end
diff --git a/tests/unit/visualize/view/tField.m b/tests/unit/visualize/view/tField.m
index 061e678..3fad28d 100644
--- a/tests/unit/visualize/view/tField.m
+++ b/tests/unit/visualize/view/tField.m
@@ -145,7 +145,7 @@ function events_autoCompression(testCase)
             expectedInputs{4} = mag.graphics.style.Stackedplot(Title = options.SecondaryTitle, YLabels = ["x [nT]", "y [nT]", "z [nT]", "|B| [nT]"], YAxisLocation = "right", Layout = [3, 1], ...
                 Charts = mag.graphics.chart.Stackedplot(YVariables = ["X", "Y", "Z", "B"], Filter = instrument.Science(1).Quality.isPlottable()));
 
-            if instrument.HasHK
+            if instrument.HasHK && any(instrument.HK.isPlottable())
 
                 expectedInputs{5} = instrument.HK(1);
                 expectedInputs{6} = [ ...