diff --git a/src/pages/Device.tsx b/src/pages/Device.tsx
index 2a03a10..911e9f0 100644
--- a/src/pages/Device.tsx
+++ b/src/pages/Device.tsx
@@ -441,16 +441,6 @@ export default function DevicePage() {
           <SmartBreadcrumb deviceName={device.name()} />
         </Grid>
         <Grid>
-          <AddComponentManualDialog 
-            device={device.id()}
-            open={addComponentManualDialogOpen}
-            onClose={() => setAddComponentManualDialogOpen(false)}
-          />
-          {user.hasFeature("developer") === true && 
-            <Button onClick={() => setAddComponentManualDialogOpen(true)}>
-              Manual Comp
-            </Button>
-          }
           <DeviceActions
             device={device}
             isPaused={false}
@@ -469,8 +459,6 @@ export default function DevicePage() {
       <DeviceOverview
         device={device}
         components={[...components.values()]}
-        // components={[]}
-        // components={components}
         usage={getUsage()}
         loading={loading}
         groupID={parseInt(groupID)}
diff --git a/src/pages/DeviceSupport.tsx b/src/pages/DeviceSupport.tsx
index 2e873e6..c540fc0 100644
--- a/src/pages/DeviceSupport.tsx
+++ b/src/pages/DeviceSupport.tsx
@@ -195,7 +195,7 @@ export default function DeviceSupport() {
 						preferences={devicePageData.preferences}
 						toggleNotificationPreference={toggleNotificationPreference}
 						refreshCallback={() => {}}
-						availablePositions={new Map()}
+						availablePositions={FindAvailablePositions(devicePageData.components, device.settings.product).availability}
 						availableOffsets={new Map()} 
 						components={[...devicePageData.components.map(comp => Component.any(comp))]}
 						interactions={devicePageData.interactions.map(inter => Interaction.any(inter))}