diff --git a/tgui/packages/tgui/interfaces/Apc.js b/tgui/packages/tgui/interfaces/Apc.js
index 0f44e3509d..72cee0bf83 100644
--- a/tgui/packages/tgui/interfaces/Apc.js
+++ b/tgui/packages/tgui/interfaces/Apc.js
@@ -206,33 +206,9 @@ const ApcContent = (props, context) => {
             <Button
               icon="lightbulb-o"
               content={data.nightshiftLights ? 'Enabled' : 'Disabled'}
-              disabled={locked}
               onClick={() => act('toggle_nightshift')} />
           )} />
       </Section>
-      {data.hijackable && (
-        <Section
-          title="Hijacking"
-          buttons={(
-            <Fragment>
-              <Button
-                icon="unlock"
-                content="Hijack"
-                disabled={data.hijacker}
-                onClick={() => act('hijack')} />
-              <Button
-                icon="lock"
-                content="Lockdown"
-                disabled={!data.lockdownavail}
-                onClick={() => act('lockdown')} />
-              <Button
-                icon="lightbulb-o"
-                content="Drain"
-                disabled={!data.drainavail}
-                onClick={() => act('drain')} />
-            </Fragment>
-          )} />
-      )}
     </Fragment>
   );
 };
diff --git a/tgui/packages/tgui/interfaces/NaniteCloudControl.js b/tgui/packages/tgui/interfaces/NaniteCloudControl.js
index 40f3dd3b21..3ecfcef92c 100644
--- a/tgui/packages/tgui/interfaces/NaniteCloudControl.js
+++ b/tgui/packages/tgui/interfaces/NaniteCloudControl.js
@@ -229,13 +229,13 @@ export const NaniteCloudBackupDetails = (props, context) => {
             )}>
             <Section>
               <NaniteInfoBox program={program} />
-              {!!can_rule && (
+              {(!!can_rule || !!program.has_rules) && (
                 <Section
                   mt={-2}
                   title="Rules"
                   level={2}
-                  buttons={(
-                    <Button
+                  buttons={(!!can_rule
+                    && <Button
                       icon="plus"
                       content="Add Rule from Disk"
                       color="good"
@@ -245,7 +245,7 @@ export const NaniteCloudBackupDetails = (props, context) => {
                   )}>
                   {program.has_rules ? (
                     rules.map(rule => (
-                      <Fragment key={rule.display}>
+                      <Box key={rule.display}>
                         <Button
                           icon="minus-circle"
                           color="bad"
@@ -253,8 +253,8 @@ export const NaniteCloudBackupDetails = (props, context) => {
                             program_id: program.id,
                             rule_id: rule.id,
                           })} />
-                        {rule.display}
-                      </Fragment>
+                        {` ${rule.display}`}
+                      </Box>
                     ))
                   ) : (
                     <Box color="bad">