diff --git a/package.json b/package.json
index 8f9fc14..2908d79 100644
--- a/package.json
+++ b/package.json
@@ -3,10 +3,10 @@
   "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "@databraid/github-widget": "^1.0.23",
-    "@databraid/sheets-widget": "^1.0.5",
-    "@databraid/slack-widget": "^1.0.24",
-    "@databraid/transit-widget": "^1.0.26",
+    "@databraid/github-widget": "^1.0.29",
+    "@databraid/sheets-widget": "^1.0.10",
+    "@databraid/slack-widget": "^1.0.27",
+    "@databraid/transit-widget": "^1.0.29",
     "localforage": "1.5.0",
     "prop-types": "15.5.10",
     "react": "15.6.1",
diff --git a/src/actions/actions.test.js b/src/actions/actions.test.js
index 67629c5..0948a90 100644
--- a/src/actions/actions.test.js
+++ b/src/actions/actions.test.js
@@ -5,55 +5,55 @@ describe('actions', () => {
   it('should create an action to add a transit widget', () => {
     const expectedAction = {
       type: TYPES.ADD_WIDGET,
-      id: TYPES.TRANSIT_WIDGET_ID,
+      widgetType: TYPES.TRANSIT_WIDGET,
     };
 
-    expect(actions.addWidget(TYPES.TRANSIT_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.addWidget(TYPES.TRANSIT_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to add a slack widget', () => {
     const expectedAction = {
       type: TYPES.ADD_WIDGET,
-      id: TYPES.SLACK_WIDGET_ID,
+      widgetType: TYPES.SLACK_WIDGET,
     };
 
-    expect(actions.addWidget(TYPES.SLACK_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.addWidget(TYPES.SLACK_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to add a github widget', () => {
     const expectedAction = {
       type: TYPES.ADD_WIDGET,
-      id: TYPES.GITHUB_WIDGET_ID,
+      widgetType: TYPES.GITHUB_WIDGET,
     };
 
-    expect(actions.addWidget(TYPES.GITHUB_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.addWidget(TYPES.GITHUB_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to remove a transit widget', () => {
     const expectedAction = {
       type: TYPES.REMOVE_WIDGET,
-      id: TYPES.TRANSIT_WIDGET_ID,
+      id: TYPES.TRANSIT_WIDGET,
     };
 
-    expect(actions.removeWidget(TYPES.TRANSIT_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.removeWidget(TYPES.TRANSIT_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to remove a slack widget', () => {
     const expectedAction = {
       type: TYPES.REMOVE_WIDGET,
-      id: TYPES.SLACK_WIDGET_ID,
+      id: TYPES.SLACK_WIDGET,
     };
 
-    expect(actions.removeWidget(TYPES.SLACK_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.removeWidget(TYPES.SLACK_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to remove a github widget', () => {
     const expectedAction = {
       type: TYPES.REMOVE_WIDGET,
-      id: TYPES.GITHUB_WIDGET_ID,
+      id: TYPES.GITHUB_WIDGET,
     };
 
-    expect(actions.removeWidget(TYPES.GITHUB_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.removeWidget(TYPES.GITHUB_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to show widget modal', () => {
@@ -91,55 +91,55 @@ describe('actions', () => {
   it('should create an action to show a transit widget sidebar', () => {
     const expectedAction = {
       type: TYPES.SHOW_WIDGET_SIDEBAR,
-      id: TYPES.TRANSIT_WIDGET_ID,
+      id: TYPES.TRANSIT_WIDGET,
     };
 
-    expect(actions.showWidgetSidebar(TYPES.TRANSIT_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.showWidgetSidebar(TYPES.TRANSIT_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to show a slack widget sidebar', () => {
     const expectedAction = {
       type: TYPES.SHOW_WIDGET_SIDEBAR,
-      id: TYPES.SLACK_WIDGET_ID,
+      id: TYPES.SLACK_WIDGET,
     };
 
-    expect(actions.showWidgetSidebar(TYPES.SLACK_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.showWidgetSidebar(TYPES.SLACK_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to show a github widget sidebar', () => {
     const expectedAction = {
       type: TYPES.SHOW_WIDGET_SIDEBAR,
-      id: TYPES.GITHUB_WIDGET_ID,
+      id: TYPES.GITHUB_WIDGET,
     };
 
-    expect(actions.showWidgetSidebar(TYPES.GITHUB_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.showWidgetSidebar(TYPES.GITHUB_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to hide a transit widget sidebar', () => {
     const expectedAction = {
       type: TYPES.HIDE_WIDGET_SIDEBAR,
-      id: TYPES.TRANSIT_WIDGET_ID,
+      id: TYPES.TRANSIT_WIDGET,
     };
 
-    expect(actions.hideWidgetSidebar(TYPES.TRANSIT_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.hideWidgetSidebar(TYPES.TRANSIT_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to hide a slack widget sidebar', () => {
     const expectedAction = {
       type: TYPES.HIDE_WIDGET_SIDEBAR,
-      id: TYPES.SLACK_WIDGET_ID,
+      id: TYPES.SLACK_WIDGET,
     };
 
-    expect(actions.hideWidgetSidebar(TYPES.SLACK_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.hideWidgetSidebar(TYPES.SLACK_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to hide a github widget sidebar', () => {
     const expectedAction = {
       type: TYPES.HIDE_WIDGET_SIDEBAR,
-      id: TYPES.GITHUB_WIDGET_ID,
+      id: TYPES.GITHUB_WIDGET,
     };
 
-    expect(actions.hideWidgetSidebar(TYPES.GITHUB_WIDGET_ID)).toEqual(expectedAction);
+    expect(actions.hideWidgetSidebar(TYPES.GITHUB_WIDGET)).toEqual(expectedAction);
   });
 
   it('should create an action to lock the widgets', () => {
diff --git a/src/actions/index.js b/src/actions/index.js
index 23182be..b24da8b 100644
--- a/src/actions/index.js
+++ b/src/actions/index.js
@@ -13,7 +13,7 @@ import {
 } from '../constants';
 
 export function addWidget(widgetType) {
-  return { type: ADD_WIDGET, id: widgetType };
+  return { type: ADD_WIDGET, widgetType };
 }
 
 export function removeWidget(widgetId) {
diff --git a/src/components/ModalAddWidget/index.jsx b/src/components/ModalAddWidget/index.jsx
index d3de5ca..73d0e06 100644
--- a/src/components/ModalAddWidget/index.jsx
+++ b/src/components/ModalAddWidget/index.jsx
@@ -3,17 +3,13 @@ import { Button, Header, Icon, Modal } from 'semantic-ui-react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import {
-  TRANSIT_WIDGET_ID,
-  SLACK_WIDGET_ID,
-  GITHUB_WIDGET_ID,
-  SHEETS_WIDGET_ID,
-} from '../../constants';
 import {
   addWidget,
   hideAddWidgetModal,
 } from '../../actions';
+import widgetConfigs from '../../configurations';
 
+/* eslint-disable react/no-unused-prop-types */
 export const AddWidgetModal = props => (
   <Modal basic open={props.showAddWidgetModal} onClose={props.hideAddWidgetModal}>
     <Header icon="new pied piper" content="Choose a widget" />
@@ -21,42 +17,21 @@ export const AddWidgetModal = props => (
       <p>Please pick the widget you wish to display.</p>
     </Modal.Content>
     <Modal.Actions>
-      <Button
-        basic
-        color="blue"
-        onClick={() => props.addWidget(TRANSIT_WIDGET_ID)}
-        inverted
-        disabled={props.ids.includes(TRANSIT_WIDGET_ID)}
-      >
-        <Icon name="rocket" size="large" />Transit
-      </Button>
-      <Button
-        basic
-        color="blue"
-        onClick={() => props.addWidget(SHEETS_WIDGET_ID)}
-        inverted
-        disabled={props.ids.includes(SHEETS_WIDGET_ID)}
-      >
-        <Icon name="table" size="large" />Sheets
-      </Button>
-      <Button
-        basic
-        color="blue"
-        onClick={() => props.addWidget(GITHUB_WIDGET_ID)}
-        inverted
-        disabled={props.ids.includes(GITHUB_WIDGET_ID)}
-      >
-        <Icon name="github" size="large" /> GitHub
-      </Button>
-      <Button
-        basic
-        color="blue"
-        onClick={() => props.addWidget(SLACK_WIDGET_ID)}
-        inverted
-        disabled={props.ids.includes(SLACK_WIDGET_ID)}
-      >
-        <Icon name="slack" size="large" /> Slack
-      </Button>
+      {
+        Object.values(widgetConfigs).map(cfg => (
+          <Button
+            basic
+            color="blue"
+            onClick={() => props.addWidget(cfg.type)}
+            inverted
+            disabled={props.ids.filter(id => props.metadata[id].type === cfg.type).length > 0}
+            key={cfg.type}
+          >
+            <Icon name={cfg.icon} size="large" />{cfg.displayName}
+          </Button>
+        ),
+        )
+      }
       <Button
         color="red"
         onClick={props.hideAddWidgetModal}
@@ -73,12 +48,17 @@ AddWidgetModal.propTypes = {
   ids: PropTypes.arrayOf(PropTypes.string).isRequired,
   addWidget: PropTypes.func.isRequired,
   hideAddWidgetModal: PropTypes.func.isRequired,
+  metadata: PropTypes.shape({
+    type: PropTypes.string,
+    showSidebar: PropTypes.bool,
+  }).isRequired,
 };
 
 export const mapStateToProps = (state) => {
   const showAddWidgetModal = state.widgets.showAddWidgetModal;
   const ids = state.widgets.ids;
-  return { showAddWidgetModal, ids };
+  const metadata = state.widgets.metadata;
+  return { showAddWidgetModal, ids, metadata };
 };
 
 export const mapDispatchToProps = dispatch => bindActionCreators({
diff --git a/src/components/WidgetContainer/index.jsx b/src/components/WidgetContainer/index.jsx
index 526ecc5..d2c5aac 100644
--- a/src/components/WidgetContainer/index.jsx
+++ b/src/components/WidgetContainer/index.jsx
@@ -8,35 +8,15 @@ import {
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import TransitComponent from '@databraid/transit-widget/lib/App';
-import SlackComponent from '@databraid/slack-widget/lib/App';
-import GithubComponent from '@databraid/github-widget/lib/App';
-import SheetsComponent from '@databraid/sheets-widget/lib/App';
-import {
-  TRANSIT_WIDGET_ID,
-  SLACK_WIDGET_ID,
-  GITHUB_WIDGET_ID,
-  SHEETS_WIDGET_ID,
-} from '../../constants';
 import {
   removeWidget,
-  showWidgetSidebar,
-  hideWidgetSidebar,
 } from '../../actions';
 import WidgetSidestrip from '../WidgetSidestrip/';
-
+import widgetConfigs from '../../configurations/';
 
 const WidgetContainer = (props) => {
-  let component;
-  if (props.id === TRANSIT_WIDGET_ID) {
-    component = <TransitComponent widgetId={props.id} />;
-  } else if (props.id === GITHUB_WIDGET_ID) {
-    component = <GithubComponent widgetId={props.id} />;
-  } else if (props.id === SLACK_WIDGET_ID) {
-    component = <SlackComponent widgetId={props.id} />;
-  } else if (props.id === SHEETS_WIDGET_ID) {
-    component = <SheetsComponent widgetId={props.id} />;
-  }
+  const WidgetComponent = widgetConfigs[props.type].widgetComponent;
+  const component = <WidgetComponent widgetId={props.id} />;
 
   return (
     <div className="widget">
@@ -76,6 +56,7 @@ WidgetContainer.propTypes = {
   id: PropTypes.string.isRequired,
   showSidebar: PropTypes.bool.isRequired,
   locked: PropTypes.bool.isRequired,
+  type: PropTypes.string.isRequired,
   removeWidget: PropTypes.func.isRequired,
 };
 
@@ -83,13 +64,12 @@ const mapStateToProps = (state, ownProps) => {
   const id = ownProps.id;
   const showSidebar = state.widgets.metadata[ownProps.id].showSidebar;
   const locked = state.widgets.locked;
-  return { id, showSidebar, locked };
+  const type = state.widgets.metadata[ownProps.id].type;
+  return { id, showSidebar, locked, type };
 };
 
 export const mapDispatchToProps = dispatch => bindActionCreators({
   removeWidget,
-  showWidgetSidebar,
-  hideWidgetSidebar,
 },
 dispatch);
 
diff --git a/src/configurations/index.js b/src/configurations/index.js
index aaf8f5b..2e88aa4 100644
--- a/src/configurations/index.js
+++ b/src/configurations/index.js
@@ -1,34 +1,56 @@
-export default [
-  {
+import { transit as transitReducer } from '@databraid/transit-widget/lib/reducers';
+import transitComponent from '@databraid/transit-widget/lib/App';
+import { github as githubReducer } from '@databraid/github-widget/lib/reducers';
+import githubComponent from '@databraid/github-widget/lib/App';
+import { storeReducer as slackReducer } from '@databraid/slack-widget/lib/Reducers';
+import slackComponent from '@databraid/slack-widget/lib/App';
+import { sheets as sheetsReducer } from '@databraid/sheets-widget/lib/reducers';
+import sheetsComponent from '@databraid/sheets-widget/lib/App';
+
+
+export default {
+  transit: {
     type: 'transit',
+    displayName: 'Transit',
     icon: 'rocket',
-    initHeight: 8,
+    initHeight: 12,
     initWidth: 6,
     minHeight: 4,
-    minWidth: 3,
+    minWidth: 4,
+    widgetReducer: transitReducer,
+    widgetComponent: transitComponent,
   },
-  {
+  github: {
     type: 'github',
+    displayName: 'GitHub',
     icon: 'github',
     initHeight: 8,
     initWidth: 6,
     minHeight: 4,
     minWidth: 6,
+    widgetReducer: githubReducer,
+    widgetComponent: githubComponent,
   },
-  {
+  slack: {
     type: 'slack',
+    displayName: 'Slack',
     icon: 'slack',
-    initHeight: 6,
+    initHeight: 9,
     initWidth: 4,
     minHeight: 4,
     minWidth: 3,
+    widgetReducer: slackReducer,
+    widgetComponent: slackComponent,
   },
-  {
+  sheets: {
     type: 'sheets',
+    displayName: 'Sheets',
     icon: 'table',
     initHeight: 8,
     initWidth: 8,
     minHeight: 4,
     minWidth: 3,
+    widgetReducer: sheetsReducer,
+    widgetComponent: sheetsComponent,
   },
-];
+};
diff --git a/src/constants/index.js b/src/constants/index.js
index 469b372..42733d4 100644
--- a/src/constants/index.js
+++ b/src/constants/index.js
@@ -1,8 +1,3 @@
-// ids - THESE WILL BE PHASED OUT AS WE MOVE TO DYNAMICALLY GENERATED IDS
-export const TRANSIT_WIDGET_ID = 'transit';
-export const SLACK_WIDGET_ID = 'slack';
-export const GITHUB_WIDGET_ID = 'github';
-export const SHEETS_WIDGET_ID = 'sheets';
 // types
 export const TRANSIT_WIDGET = 'transit';
 export const SLACK_WIDGET = 'slack';
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 8d70c7b..e637302 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -1,15 +1,7 @@
 import { combineReducers } from 'redux';
-import { sheets as sheetsReducer } from '@databraid/sheets-widget/lib/reducers';
-import { transit as transitReducer } from '@databraid/transit-widget/lib/reducers';
-import { github as githubReducer } from '@databraid/github-widget/lib/reducers';
-import { storeReducer as slackReducer } from '@databraid/slack-widget/lib/Reducers';
 import { REHYDRATE } from 'redux-persist/constants';
 import widgetConfigs from '../configurations/';
 import {
-  TRANSIT_WIDGET_ID,
-  SLACK_WIDGET_ID,
-  GITHUB_WIDGET_ID,
-  SHEETS_WIDGET_ID,
   ADD_WIDGET,
   REMOVE_WIDGET,
   SHOW_ADD_WIDGET_MODAL,
@@ -54,14 +46,11 @@ export const getWidgetConfigByType = (type) => {
   if (!type) {
     return undefined;
   }
-  const configurations = widgetConfigs.filter(cfg => cfg.type === type);
-  if (configurations.length === 0) {
-    throw new Error(`Invalid widget type in configurations file - type [${type}] does not exist`);
+  const configuration = widgetConfigs[type];
+  if (!configuration) {
+    throw new Error(`Invalid widget type in configuration file - type [${type}] does not exist`);
   }
-  if (configurations.length > 1) {
-    throw new Error(`Invalid widget type in configurations file - multiple entries of type [${type}]`);
-  }
-  return configurations[0];
+  return configuration;
 };
 
 const isXOverlap = (newX, newW, widgetX, widgetW) => {
@@ -133,7 +122,7 @@ export const calculateInitialPosition = (layout, width, height, maxCols = 12) =>
 export const widgets = (state = initialState, action) => {
   switch (action.type) {
     case ADD_WIDGET: {
-      const widgetConfig = getWidgetConfigByType(action.id);
+      const widgetConfig = getWidgetConfigByType(action.widgetType);
       const newLoc = calculateInitialPosition(
         state.grid.layout,
         widgetConfig.initWidth,
@@ -141,14 +130,19 @@ export const widgets = (state = initialState, action) => {
       );
       return {
         ...state,
-        ids: [...state.ids, widgetConfig.type],
+        ids: [...state.ids, state.grid.nextId.toString()],
+        byId: {
+          ...state.byId,
+          [state.grid.nextId.toString()]: widgetConfig.widgetReducer(undefined, action),
+        },
         showAddWidgetModal: false,
         grid: {
           ...state.grid,
+          nextId: state.grid.nextId + 1,
           layout: [
             ...state.grid.layout,
             {
-              i: widgetConfig.type,
+              i: state.grid.nextId.toString(),
               x: newLoc.x,
               y: newLoc.y,
               w: widgetConfig.initWidth,
@@ -161,7 +155,7 @@ export const widgets = (state = initialState, action) => {
         },
         metadata: {
           ...state.metadata,
-          [action.id]: {
+          [state.grid.nextId.toString()]: {
             type: widgetConfig.type,
             showSidebar: false,
           },
@@ -283,17 +277,18 @@ export const widgets = (state = initialState, action) => {
         },
       };
 
-    default:
+    default: {
+      const newStates = {};
+      state.ids.forEach((id) => {
+        const widgetConfig = getWidgetConfigByType(state.metadata[id].type);
+        newStates[id] = widgetConfig.widgetReducer(state.byId[id], action);
+      });
       return {
         ...state,
-        byId: {
-          [TRANSIT_WIDGET_ID]: transitReducer(state.byId[TRANSIT_WIDGET_ID], action),
-          [GITHUB_WIDGET_ID]: githubReducer(state.byId[GITHUB_WIDGET_ID], action),
-          [SLACK_WIDGET_ID]: slackReducer(state.byId[SLACK_WIDGET_ID], action),
-          [SHEETS_WIDGET_ID]: sheetsReducer(state.byId[SHEETS_WIDGET_ID], action),
-        },
+        byId: newStates,
         showSidebar: state.ids.length === 0,
       };
+    }
   }
 };
 
diff --git a/src/reducers/reducers.test.js b/src/reducers/reducers.test.js
index 0aaa0d2..1cbb125 100644
--- a/src/reducers/reducers.test.js
+++ b/src/reducers/reducers.test.js
@@ -1,20 +1,10 @@
 import { Reducer } from 'redux-testkit';
-import { transit as transitReducer } from '@databraid/transit-widget/lib/reducers';
-import { github as githubReducer } from '@databraid/github-widget/lib/reducers';
-import { sheets as sheetsReducer } from '@databraid/sheets-widget/lib/reducers';
-import { storeReducer as slackReducer } from '@databraid/slack-widget/lib/Reducers';
 import {
   widgets as rootReducer,
   collapseWidgetSidebars,
   calculateInitialPosition,
   isValidLocation,
 } from './index';
-import {
-  TRANSIT_WIDGET_ID,
-  SLACK_WIDGET_ID,
-  GITHUB_WIDGET_ID,
-  SHEETS_WIDGET_ID,
-} from '../constants';
 
 const initialState = {
   ids: [],
@@ -31,21 +21,42 @@ const initialState = {
 };
 
 const stateWithTransit = {
-  byId: {},
+  byId: {
+    1: {
+      alerts: {
+        alerts: {},
+      },
+      configuration: {
+        currentLocation: {
+          address: '44 Tehama St, San Francisco, CA 94105',
+          lat: 37.7873889,
+          lng: -122.3964106,
+        },
+        geolocating: true,
+      },
+      destinations: {
+        byId: {},
+        ids: [],
+      },
+      journeys: {
+        byDestinationId: {},
+      },
+    },
+  },
   showSidebar: true,
-  ids: [TRANSIT_WIDGET_ID],
+  ids: ['1'],
   showAddWidgetModal: false,
   grid: {
-    nextId: 1,
+    nextId: 2,
     layout: [
       {
-        i: TRANSIT_WIDGET_ID,
+        i: '1',
         x: 0,
         y: 0,
         w: 6,
-        h: 8,
+        h: 12,
         minH: 4,
-        minW: 3,
+        minW: 4,
         static: false,
       },
     ],
@@ -53,7 +64,7 @@ const stateWithTransit = {
     cols: { lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 },
   },
   metadata: {
-    transit: {
+    1: {
       type: 'transit',
       showSidebar: false,
     },
@@ -61,15 +72,50 @@ const stateWithTransit = {
 };
 
 const stateWithGithub = {
-  byId: {},
+  byId: {
+    1: {
+      currentPage: {
+        render: 'login',
+        repoName: null,
+        selectedOrgName: null,
+        userName: '',
+      },
+      issues: {
+        ids: [],
+        issuesById: {},
+        loadingIssues: true,
+        repoName: '',
+      },
+      milestones: {
+        ids: [],
+        milestonesById: {},
+        repoName: '',
+      },
+      orgs: {
+        ids: [],
+        orgsById: {},
+      },
+      pullRequests: {
+        ids: [],
+        loadingPrTable: true,
+        prsById: {},
+        repoName: '',
+      },
+      repos: {
+        ids: [],
+        orgName: '',
+        reposById: {},
+      },
+    },
+  },
   showSidebar: true,
-  ids: [GITHUB_WIDGET_ID],
+  ids: ['1'],
   showAddWidgetModal: false,
   grid: {
-    nextId: 1,
+    nextId: 2,
     layout: [
       {
-        i: GITHUB_WIDGET_ID,
+        i: '1',
         x: 0,
         y: 0,
         w: 6,
@@ -83,7 +129,7 @@ const stateWithGithub = {
     cols: { lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 },
   },
   metadata: {
-    github: {
+    1: {
       type: 'github',
       showSidebar: false,
     },
@@ -91,19 +137,27 @@ const stateWithGithub = {
 };
 
 const stateWithSlack = {
-  byId: {},
+  byId: {
+    1: {
+      channelData: {},
+      isConnectedWithSlack: false,
+      isShowingScores: false,
+      scoreData: {},
+      selectedChannel: null,
+    },
+  },
   showSidebar: true,
-  ids: [SLACK_WIDGET_ID],
+  ids: ['1'],
   showAddWidgetModal: false,
   grid: {
-    nextId: 1,
+    nextId: 2,
     layout: [
       {
-        i: SLACK_WIDGET_ID,
+        i: '1',
         x: 0,
         y: 0,
         w: 4,
-        h: 6,
+        h: 9,
         minH: 4,
         minW: 3,
         static: false,
@@ -113,7 +167,7 @@ const stateWithSlack = {
     cols: { lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 },
   },
   metadata: {
-    slack: {
+    1: {
       type: 'slack',
       showSidebar: false,
     },
@@ -125,12 +179,7 @@ describe('rootReducer', () => {
     expect(rootReducer(initialState, {}))
       .toEqual({
         ...initialState,
-        byId: {
-          [TRANSIT_WIDGET_ID]: transitReducer(undefined, {}),
-          [GITHUB_WIDGET_ID]: githubReducer(undefined, {}),
-          [SLACK_WIDGET_ID]: slackReducer(undefined, {}),
-          [SHEETS_WIDGET_ID]: sheetsReducer(undefined, {}),
-        },
+        byId: {},
       });
   });
 
@@ -140,38 +189,33 @@ describe('rootReducer', () => {
       .expect({ type: 'NOT_EXISTING' })
       .toReturnState({
         ...initialState,
-        byId: {
-          [TRANSIT_WIDGET_ID]: transitReducer(undefined, {}),
-          [GITHUB_WIDGET_ID]: githubReducer(undefined, {}),
-          [SLACK_WIDGET_ID]: slackReducer(undefined, {}),
-          [SHEETS_WIDGET_ID]: sheetsReducer(undefined, {}),
-        },
+        byId: {},
       });
   });
 
   it('should add the transit widget to the dashboard', () => {
-    const action = { type: 'ADD_WIDGET', id: 'transit' };
+    const action = { type: 'ADD_WIDGET', widgetType: 'transit' };
     Reducer(rootReducer).withState(initialState).expect(action).toReturnState({
       ...stateWithTransit,
     });
   });
 
   it('should add the github widget to the dashboard', () => {
-    const action = { type: 'ADD_WIDGET', id: 'github' };
+    const action = { type: 'ADD_WIDGET', widgetType: 'github' };
     Reducer(rootReducer).withState(initialState).expect(action).toReturnState({
       ...stateWithGithub,
     });
   });
 
   it('should add the slack widget to the dashboard', () => {
-    const action = { type: 'ADD_WIDGET', id: 'slack' };
+    const action = { type: 'ADD_WIDGET', widgetType: 'slack' };
     Reducer(rootReducer).withState(initialState).expect(action).toReturnState({
       ...stateWithSlack,
     });
   });
 
   it('should remove the transit widget from the dashboard', () => {
-    const action = { type: 'REMOVE_WIDGET', id: 'transit' };
+    const action = { type: 'REMOVE_WIDGET', id: '1' };
     Reducer(rootReducer).withState(stateWithTransit).expect(action).toReturnState({
       ...stateWithTransit,
       ids: [],
@@ -179,7 +223,7 @@ describe('rootReducer', () => {
   });
 
   it('should remove the github widget from the dashboard', () => {
-    const action = { type: 'REMOVE_WIDGET', id: 'github' };
+    const action = { type: 'REMOVE_WIDGET', id: '1' };
     Reducer(rootReducer).withState(stateWithGithub).expect(action).toReturnState({
       ...stateWithGithub,
       ids: [],
@@ -187,7 +231,7 @@ describe('rootReducer', () => {
   });
 
   it('should remove the slack widget from the dashboard', () => {
-    const action = { type: 'REMOVE_WIDGET', id: 'slack' };
+    const action = { type: 'REMOVE_WIDGET', id: '1' };
     Reducer(rootReducer).withState(stateWithSlack).expect(action).toReturnState({
       ...stateWithSlack,
       ids: [],
@@ -388,24 +432,45 @@ describe('rootReducer', () => {
   it('should persist new grid layout to state', () => {
     const action = {
       type: 'SAVE_LAYOUT_CHANGE',
-      layout: [{ i: TRANSIT_WIDGET_ID, x: 2, y: 3, w: 6, h: 8, minH: 4, minW: 4, static: false }],
+      layout: [{ i: '1', x: 2, y: 3, w: 6, h: 8, minH: 4, minW: 4, static: false }],
     };
 
     Reducer(rootReducer).withState(stateWithTransit).expect(action).toReturnState({
-      byId: {},
+      byId: {
+        1: {
+          alerts: {
+            alerts: {},
+          },
+          configuration: {
+            currentLocation: {
+              address: '44 Tehama St, San Francisco, CA 94105',
+              lat: 37.7873889,
+              lng: -122.3964106,
+            },
+            geolocating: true,
+          },
+          destinations: {
+            byId: {},
+            ids: [],
+          },
+          journeys: {
+            byDestinationId: {},
+          },
+        },
+      },
       showSidebar: true,
-      ids: [TRANSIT_WIDGET_ID],
+      ids: ['1'],
       showAddWidgetModal: false,
       grid: {
-        nextId: 1,
+        nextId: 2,
         layout: [
-          { i: TRANSIT_WIDGET_ID, x: 2, y: 3, w: 6, h: 8, minH: 4, minW: 4, static: false },
+          { i: '1', x: 2, y: 3, w: 6, h: 8, minH: 4, minW: 4, static: false },
         ],
         breakpoints: { lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 },
         cols: { lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 },
       },
       metadata: {
-        transit: {
+        1: {
           type: 'transit',
           showSidebar: false,
         },
@@ -462,7 +527,7 @@ const layoutWithOne = [
 describe('non-reducer functions', () => {
   describe('collapseWidgetSidebars', () => {
     it('should return new metadata with all widget sidebars not showing', () => {
-      expect(collapseWidgetSidebars({ transit: {
+      expect(collapseWidgetSidebars({ 1: {
         type: 'transit',
         showSidebar: true,
       },
diff --git a/src/test/__snapshots__/modal.test.jsx.snap b/src/test/__snapshots__/modal.test.jsx.snap
index 44f5a6b..d777c86 100644
--- a/src/test/__snapshots__/modal.test.jsx.snap
+++ b/src/test/__snapshots__/modal.test.jsx.snap
@@ -44,10 +44,10 @@ exports[`AddWidgetModal component should render a component with props as specif
     >
       <Icon
         as="i"
-        name="table"
+        name="github"
         size="large"
       />
-      Sheets
+      GitHub
     </Button>
     <Button
       as="button"
@@ -59,25 +59,25 @@ exports[`AddWidgetModal component should render a component with props as specif
     >
       <Icon
         as="i"
-        name="github"
+        name="slack"
         size="large"
       />
-       GitHub
+      Slack
     </Button>
     <Button
       as="button"
       basic={true}
       color="blue"
-      disabled={true}
+      disabled={false}
       inverted={true}
       onClick={[Function]}
     >
       <Icon
         as="i"
-        name="slack"
+        name="table"
         size="large"
       />
-       Slack
+      Sheets
     </Button>
     <Button
       as="button"
diff --git a/src/test/modal.test.jsx b/src/test/modal.test.jsx
index fca7d89..e3a8f5f 100644
--- a/src/test/modal.test.jsx
+++ b/src/test/modal.test.jsx
@@ -6,7 +6,7 @@ import { AddWidgetModal, mapStateToProps, mapDispatchToProps } from '../componen
 const state = {
   widgets: {
     showAddWidgetModal: true,
-    ids: ['slack'],
+    ids: ['1'],
   },
 };
 
@@ -19,8 +19,9 @@ describe('AddWidgetModal component', () => {
       <AddWidgetModal
         addWidget={addWidget}
         hideAddWidgetModal={hideAddWidgetModal}
-        ids={['slack']}
+        ids={['1']}
         showAddWidgetModal={true}
+        metadata={{ 1: 'slack' }}
       />,
     );
     expect(toJson(component)).toMatchSnapshot();
@@ -29,7 +30,7 @@ describe('AddWidgetModal component', () => {
   it('maps given state to props ', () => {
     const expected = {
       showAddWidgetModal: true,
-      ids: ['slack'],
+      ids: ['1'],
     };
     expect(mapStateToProps(state)).toEqual(expected);
   });