diff --git a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
index 6b36b86a23..b8f18a8b3d 100644
--- a/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
+++ b/Content.Client/Atmos/Monitor/UI/AirAlarmWindow.xaml
@@ -18,18 +18,19 @@
                 </BoxContainer>
             </BoxContainer>
             <!-- Right column (address, device total) -->
-            <BoxContainer Orientation="Horizontal" Margin="0 0 2 0" HorizontalExpand="True">
-                <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-                    <Label Text="{Loc 'air-alarm-ui-window-address-label'}" HorizontalExpand="True"/>
-                    <Label Text="{Loc 'air-alarm-ui-window-device-count-label'}" HorizontalExpand="True"/>
-                </BoxContainer>
-                <BoxContainer Orientation="Vertical" HorizontalExpand="True">
-                    <Label Name="CDeviceAddress" HorizontalAlignment="Right" HorizontalExpand="True" Margin="0 0 4 0" />
-                    <Label Name="CDeviceTotal" HorizontalAlignment="Right" HorizontalExpand="True" Margin="0 0 4 0" />
+            <BoxContainer Orientation="Vertical">
+                <BoxContainer Orientation="Horizontal" Margin="0 0 2 0" HorizontalExpand="True">
+                    <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+                        <Label Text="{Loc 'air-alarm-ui-window-address-label'}" />
+                        <Label Text="{Loc 'air-alarm-ui-window-device-count-label'}" />
+                    </BoxContainer>
+                    <BoxContainer Orientation="Vertical" HorizontalExpand="True">
+                        <Label Name="CDeviceAddress" HorizontalAlignment="Right" />
+                        <Label Name="CDeviceTotal" HorizontalAlignment="Right" />
+                    </BoxContainer>
                 </BoxContainer>
                 <Button Name="CResyncButton" Text="{Loc 'air-alarm-ui-window-resync-devices-label'}" HorizontalExpand="True" />
             </BoxContainer>
-
         </BoxContainer>
         <!-- Gas/Device Data -->
         <TabContainer Name="CTabContainer" VerticalExpand="True" Margin="0 0 0 2">
diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml
index da77c6754c..51b388136f 100644
--- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml
+++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml
@@ -1,7 +1,7 @@
 <BoxContainer xmlns="https://spacestation14.io">
     <Collapsible Orientation="Vertical">
         <CollapsibleHeading Name="SensorAddress" />
-        <CollapsibleBody>
+        <CollapsibleBody Margin="2">
             <BoxContainer Orientation="Vertical">
                 <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
                     <BoxContainer Orientation="Vertical" Margin="0 0 2 0" HorizontalExpand="True">
@@ -15,7 +15,7 @@
                         <RichTextLabel Name="AlarmStateLabel" />
                     </BoxContainer>
                 </BoxContainer>
-                <Collapsible Margin="0 0 2 0">
+                <Collapsible Orientation="Vertical" Margin="2">
                     <CollapsibleHeading Title="{Loc 'air-alarm-ui-sensor-gases'}" />
                     <CollapsibleBody>
                         <BoxContainer Name="GasContainer" Orientation="Vertical" Margin="2" />
@@ -27,7 +27,7 @@
                         <BoxContainer Orientation="Vertical">
                             <Control Name="PressureThresholdContainer" Margin="2 0 2 0" />
                             <Control Name="TemperatureThresholdContainer" Margin="2 0 2 0" />
-                            <Collapsible Orientation="Vertical">
+                            <Collapsible Orientation="Vertical" Margin="2 0 2 0">
                                 <CollapsibleHeading Title="{Loc 'air-alarm-ui-sensor-gases'}" />
                                 <CollapsibleBody Margin="4 2 4 2">
                                     <BoxContainer Name="GasThresholds" Orientation="Vertical" Margin="2 0 2 0" />