diff --git a/src/ts/@overflow/app/views/layout/SensorDetailLayout.tsx b/src/ts/@overflow/app/views/layout/SensorDetailLayout.tsx
index b2612b9..36be9d3 100644
--- a/src/ts/@overflow/app/views/layout/SensorDetailLayout.tsx
+++ b/src/ts/@overflow/app/views/layout/SensorDetailLayout.tsx
@@ -39,10 +39,6 @@ class SensorDetailLayout extends React.Component<Props, State> {
         'name': 'Setup',
         'path': this.state.currUrl + '/setup',
       },
-       {
-        'name': 'Tree',
-        'path': this.state.currUrl + '/tree',
-      },
     ];
     return (
       <Container fluid>
@@ -57,6 +53,7 @@ class SensorDetailLayout extends React.Component<Props, State> {
             <Route exact={true} path={`${this.props.match.url}/:id/items`} component={SensorDetailItems} />
             {/*<Route path={`${this.props.match.url}/:id/history/`} component={EmailConfirm}/>*/}
             <Route exact={true} path={`${this.props.match.url}/:id/setup`} component={SensorSetup} />
+            <Route exact={true} path={`${this.props.match.url}/setup`} component={SensorSetup} />
             <Route exact={true} path={`${this.props.match.url}/:id/tree`} component={SensorItemTree} />
           </Switch>
           <Footer />
diff --git a/src/ts/@overflow/sensor/react/SensorList.tsx b/src/ts/@overflow/sensor/react/SensorList.tsx
index 195037d..f2fa2e0 100644
--- a/src/ts/@overflow/sensor/react/SensorList.tsx
+++ b/src/ts/@overflow/sensor/react/SensorList.tsx
@@ -37,7 +37,7 @@ export function mapDispatchToProps(dispatch: Dispatch<any>): SensorListDispatchP
       dispatch(routerPush('/sensor/' + String(id)));
     },
     onAddSensor: (target: Target) => {
-      dispatch(routerPush('/sensor/' + String(11)));
+      dispatch(routerPush('/sensor/setup'));
     },
   };
 }
diff --git a/src/ts/@overflow/sensor/react/components/SensorList.tsx b/src/ts/@overflow/sensor/react/components/SensorList.tsx
index 973f70e..0710cbd 100644
--- a/src/ts/@overflow/sensor/react/components/SensorList.tsx
+++ b/src/ts/@overflow/sensor/react/components/SensorList.tsx
@@ -116,7 +116,7 @@ export class SensorList extends React.Component<SensorListProps, SensorListState
     console.log(event);
   }
   public handleAddSensor(): void {
-    console.log('adding a sensor');
+    this.props.onAddSensor(this.props.target);
   }
 
   public render(): JSX.Element {
@@ -148,8 +148,11 @@ export class SensorList extends React.Component<SensorListProps, SensorListState
               </Table.Row>
             ))}
           </Table.Body>
+          <Table.Footer>
+            <Button content='Add' icon='add' labelPosition='left' floated='right' positive onClick={this.handleAddSensor.bind(this)} />
+          </Table.Footer>
         </Table>
-        <Button content='Add' icon='add' labelPosition='left' floated='right' positive onClick={this.handleAddSensor.bind(this)} />
+
       </Container>
     );
   }