diff --git a/server/package-lock.json b/server/package-lock.json
index 07d45e4..bad85d9 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -221,7 +221,8 @@
     "auto-bind2": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/auto-bind2/-/auto-bind2-1.0.3.tgz",
-      "integrity": "sha512-+br9nya9M8ayHjai7m9rdpRxuEr8xcYRDrIp7HybNe0ixUHbc1kDiWXKMb0ldsfWb9Zi+SqJ9JfjW8nTkYD0QQ=="
+      "integrity": "sha512-+br9nya9M8ayHjai7m9rdpRxuEr8xcYRDrIp7HybNe0ixUHbc1kDiWXKMb0ldsfWb9Zi+SqJ9JfjW8nTkYD0QQ==",
+      "dev": true
     },
     "autobind-decorator": {
       "version": "2.1.0",
diff --git a/server/package.json b/server/package.json
index 74965b5..62fa46e 100644
--- a/server/package.json
+++ b/server/package.json
@@ -21,7 +21,6 @@
   "dependencies": {
     "amqplib": "^0.5.1",
     "app-root-path": "^2.0.1",
-    "auto-bind2": "^1.0.3",
     "autobind-decorator": "^2.1.0",
     "aws-sdk": "^2.98.0",
     "body-parser": "^1.17.1",
diff --git a/website/src/Teams/TeamList.js b/website/src/Teams/TeamList.js
index 96b75ed..486ecf7 100644
--- a/website/src/Teams/TeamList.js
+++ b/website/src/Teams/TeamList.js
@@ -32,15 +32,15 @@ export class TeamList extends React.Component {
     return (
       <Column fillParent>
         <Column.Item grow>
-          <List items={teams} render={(user, index) => {
+          <List items={teams} render={(team, index) => {
             return (
-              <List.Item key={user._id || '0'} onClick={(e) => (this.props.onTeamListClick(e, index))}
-                active={user === this.props.selectedTeam}>
-                <List.Icon name={user.administrator ? 'admin' : 'profile'} size={sizeInfo.listIcon} />
+              <List.Item key={team._id || '0'} onClick={(e) => (this.props.onTeamListClick(e, index))}
+                active={team === selectedTeam}>
+                <List.Icon name='team' size={sizeInfo.listIcon} />
                 <List.Text>
-                  { user._id ? user.firstName + ' ' + user.lastName : '[New Team]' }
+                  { team._id ? team.name : '[New Team]' }
                 </List.Text>
-                { user === selectedTeam && selectionModified ? <List.Icon name='edit' size={sizeInfo.listIcon} /> : null }
+                { team === selectedTeam && selectionModified ? <List.Icon name='edit' size={sizeInfo.listIcon} /> : null }
               </List.Item>
             )
           }} />
diff --git a/website/src/Teams/Teams.js b/website/src/Teams/Teams.js
index 9d27089..7108069 100644
--- a/website/src/Teams/Teams.js
+++ b/website/src/Teams/Teams.js
@@ -32,7 +32,7 @@ export class Teams extends Component {
 
     api.listTeams().then((list) => {
       list.items.sort((teamA, teamB) => (teamA.lastName.localeCompare(teamB.lastName)))
-      this.setState({ teams: list.items, selectedTeam: list.items[0] }) // TODO: <- Remove
+      this.setState({ teams: list.items }) // TODO: <- Remove
     }).catch((error) => {
       this.setState({
         messageModal: {
diff --git a/website/src/Users/Users.js b/website/src/Users/Users.js
index b25b925..04e8022 100644
--- a/website/src/Users/Users.js
+++ b/website/src/Users/Users.js
@@ -32,7 +32,7 @@ export class Users extends Component {
 
     api.listUsers().then((list) => {
       list.items.sort((userA, userB) => (userA.lastName.localeCompare(userB.lastName)))
-      this.setState({ users: list.items, selectedUser: list.items[0] }) // TODO: <- Remove
+      this.setState({ users: list.items })
     }).catch((error) => {
       this.setState({
         messageModal: {
diff --git a/website/src/ui/BoundDropdownList.js b/website/src/ui/BoundDropdownList.js
new file mode 100644
index 0000000..e69de29
diff --git a/website/src/ui/BoundList.js b/website/src/ui/BoundList.js
new file mode 100644
index 0000000..e69de29