diff --git a/__tests__/App.test.jsx b/__tests__/App.test.jsx
index 4d1efe68a4..9048c3fab5 100644
--- a/__tests__/App.test.jsx
+++ b/__tests__/App.test.jsx
@@ -1,61 +1,111 @@
 import React from 'react';
-import { HashRouter as Router } from 'react-router-dom';
+import { HashRouter } from 'react-router-dom';
+import { I18nProvider } from '@lingui/react';
 
-import { shallow, mount } from 'enzyme';
-import App from '../src/App';
-import api from '../src/api';
-import { API_LOGOUT } from '../src/endpoints';
-
-import Dashboard from '../src/pages/Dashboard';
+import { mount, shallow } from 'enzyme';
 import { asyncFlush } from '../jest.setup';
 
-const DEFAULT_ACTIVE_GROUP = 'views_group';
-const DEFAULT_ACTIVE_ITEM = 'views_group_dashboard';
+import App from '../src/App';
 
-const routeGroups = [{
-  groupId: DEFAULT_ACTIVE_GROUP,
-  title: 'test',
-  routes: [{ path: '/home', title: 'Dashboard', component:  Dashboard }],
-}];
+const DEFAULT_ACTIVE_GROUP = 'views_group';
 
 describe('<App />', () => {
-  test('renders without crashing', () => {
-    const appWrapper = shallow(<App />);
+  test('expected content is rendered', () => {
+    const appWrapper = mount(
+      <HashRouter>
+        <I18nProvider>
+          <App
+            routeGroups={[
+              {
+                title: 'Group One',
+                groupId: 'group_one',
+                routes: [
+                  { title: 'Foo', path: '/foo' },
+                  { title: 'Bar', path: '/bar' },
+                ],
+              },
+              {
+                title: 'Group Two',
+                groupId: 'group_two',
+                routes: [
+                  { title: 'Fiz', path: '/fiz' },
+                ]
+              }
+            ]}
+            render={({ routeGroups }) => (
+              routeGroups.map(({ groupId }) => (<div key={groupId} id={groupId} />))
+            )}
+          />
+        </I18nProvider>
+      </HashRouter>
+    );
+
+    // page components
     expect(appWrapper.length).toBe(1);
+    expect(appWrapper.find('PageHeader').length).toBe(1);
+    expect(appWrapper.find('PageSidebar').length).toBe(1);
+
+    // sidebar groups and route links
+    expect(appWrapper.find('NavExpandableGroup').length).toBe(2);
+    expect(appWrapper.find('a[href="/#/foo"]').length).toBe(1);
+    expect(appWrapper.find('a[href="/#/bar"]').length).toBe(1);
+    expect(appWrapper.find('a[href="/#/fiz"]').length).toBe(1);
+
+    // inline render
+    expect(appWrapper.find('#group_one').length).toBe(1);
+    expect(appWrapper.find('#group_two').length).toBe(1);
   });
 
   test('onNavToggle sets state.isNavOpen to opposite', () => {
     const appWrapper = shallow(<App />);
-    expect(appWrapper.state().isNavOpen).toBe(true);
-    appWrapper.instance().onNavToggle();
-    expect(appWrapper.state().isNavOpen).toBe(false);
+    const { onNavToggle } = appWrapper.instance();
+
+    [true, false, true, false, true].forEach(expected => {
+      expect(appWrapper.state().isNavOpen).toBe(expected);
+      onNavToggle();
+    });
   });
 
   test('onLogoClick sets selected nav back to defaults', () => {
     const appWrapper = shallow(<App />);
+
     appWrapper.setState({ activeGroup: 'foo', activeItem: 'bar' });
     expect(appWrapper.state().activeItem).toBe('bar');
     expect(appWrapper.state().activeGroup).toBe('foo');
+
     appWrapper.instance().onLogoClick();
     expect(appWrapper.state().activeGroup).toBe(DEFAULT_ACTIVE_GROUP);
   });
 
-  test('api.logout called from logout button', async () => {
-    api.get = jest.fn().mockImplementation(() => Promise.resolve({}));
-    const appWrapper = shallow(<App />);
-    appWrapper.instance().onDevLogout();
-    appWrapper.setState({ activeGroup: 'foo', activeItem: 'bar' });
-    expect(api.get).toHaveBeenCalledTimes(1);
-    expect(api.get).toHaveBeenCalledWith(API_LOGOUT);
+  test('logout button click triggers expected callback', async (done) => {
+    const logout = jest.fn(() => Promise.resolve());
+    const api = { logout };
+
+    const appWrapper = mount(
+      <HashRouter>
+        <I18nProvider>
+          <App api={api} />
+        </I18nProvider>
+      </HashRouter>
+    );
+
+    appWrapper.find('button[id="button-logout"]').simulate('click');
     await asyncFlush();
-    expect(appWrapper.state().activeItem).toBe(DEFAULT_ACTIVE_ITEM);
-    expect(appWrapper.state().activeGroup).toBe(DEFAULT_ACTIVE_GROUP);
+    expect(api.logout).toHaveBeenCalledTimes(1);
+
+    done();
   });
 
-  test('Componenet makes REST call to API_CONFIG endpoint when mounted', () => {
-    api.get = jest.fn().mockImplementation(() => Promise.resolve({}));
-    const appWrapper = shallow(<App.WrappedComponent />);
+  test('Component makes expected call to api client when mounted', () => {
+    const getConfig = jest.fn().mockImplementation(() => Promise.resolve({}));
+    const api = { getConfig };
+    const appWrapper = mount(
+      <HashRouter>
+        <I18nProvider>
+          <App api={api} />
+        </I18nProvider>
+      </HashRouter>
+    );
     expect(api.get).toHaveBeenCalledTimes(1);
-    expect(api.get).toHaveBeenCalledWith(API_CONFIG);
   });
 });
diff --git a/__tests__/components/About.test.jsx b/__tests__/components/About.test.jsx
index e20fe77057..c6d322a55d 100644
--- a/__tests__/components/About.test.jsx
+++ b/__tests__/components/About.test.jsx
@@ -1,8 +1,6 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { I18nProvider } from '@lingui/react';
-import api from '../../src/api';
-import { API_CONFIG } from '../../src/endpoints';
 import About from '../../src/components/About';
 
 describe('<About />', () => {
@@ -19,16 +17,16 @@ describe('<About />', () => {
     aboutWrapper.unmount();
   });
 
-  test('close button calls onAboutModalClose', () => {
-    const onAboutModalClose = jest.fn();
+  test('close button calls onClose handler', () => {
+    const onClose = jest.fn();
     aboutWrapper = mount(
       <I18nProvider>
-        <About isOpen onAboutModalClose={onAboutModalClose} />
+        <About isOpen onClose={onClose} />
       </I18nProvider>
     );
     closeButton = aboutWrapper.find('AboutModalBoxCloseButton Button');
     closeButton.simulate('click');
-    expect(onAboutModalClose).toBeCalled();
+    expect(onClose).toBeCalled();
     aboutWrapper.unmount();
   });
 });
diff --git a/__tests__/components/HelpDropdown.test.jsx b/__tests__/components/HelpDropdown.test.jsx
deleted file mode 100644
index b2b9da1df1..0000000000
--- a/__tests__/components/HelpDropdown.test.jsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme';
-import { I18nProvider } from '@lingui/react';
-import HelpDropdown from '../../src/components/HelpDropdown';
-
-let questionCircleIcon;
-let dropdownWrapper;
-let dropdownComponentInstance;
-let dropdownToggle;
-let dropdownItems;
-let dropdownItem;
-
-beforeEach(() => {
-  dropdownWrapper = mount(
-    <I18nProvider>
-      <HelpDropdown />
-    </I18nProvider>
-  );
-  dropdownComponentInstance = dropdownWrapper.find(HelpDropdown).instance();
-});
-
-afterEach(() => {
-  dropdownWrapper.unmount();
-});
-
-describe('<HelpDropdown />', () => {
-  test('initially renders without crashing', () => {
-    expect(dropdownWrapper.length).toBe(1);
-    expect(dropdownComponentInstance.state.isOpen).toEqual(false);
-    expect(dropdownComponentInstance.state.showAboutModal).toEqual(false);
-    questionCircleIcon = dropdownWrapper.find('QuestionCircleIcon');
-    expect(questionCircleIcon.length).toBe(1);
-  });
-
-  test('renders two dropdown items', () => {
-    dropdownComponentInstance.setState({ isOpen: true });
-    dropdownWrapper.update();
-    dropdownItems = dropdownWrapper.find('DropdownItem');
-    expect(dropdownItems.length).toBe(2);
-    const dropdownTexts = dropdownItems.map(item => item.text());
-    expect(dropdownTexts).toEqual(['Help', 'About']);
-  });
-
-  test('onToggle sets state.isOpen to opposite', () => {
-    dropdownComponentInstance.setState({ isOpen: true });
-    dropdownWrapper.update();
-    dropdownToggle = dropdownWrapper.find('DropdownToggle > DropdownToggle');
-    dropdownToggle.simulate('click');
-    expect(dropdownComponentInstance.state.isOpen).toEqual(false);
-  });
-
-  test('about dropdown item sets state.showAboutModal to true', () => {
-    dropdownComponentInstance.setState({ isOpen: true });
-    dropdownWrapper.update();
-    dropdownItem = dropdownWrapper.find('DropdownItem a').at(1);
-    dropdownItem.simulate('click');
-    expect(dropdownComponentInstance.state.showAboutModal).toEqual(true);
-  });
-
-  test('onAboutModalClose sets state.showAboutModal to false', () => {
-    dropdownComponentInstance.setState({ showAboutModal: true });
-    dropdownWrapper.update();
-    const aboutModal = dropdownWrapper.find('AboutModal');
-    aboutModal.find('AboutModalBoxCloseButton Button').simulate('click');
-    expect(dropdownComponentInstance.state.showAboutModal).toEqual(false);
-  });
-});
-
diff --git a/__tests__/components/LogoutButton.test.jsx b/__tests__/components/LogoutButton.test.jsx
deleted file mode 100644
index aaded3cd3f..0000000000
--- a/__tests__/components/LogoutButton.test.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme';
-import { I18nProvider } from '@lingui/react';
-import LogoutButton from '../../src/components/LogoutButton';
-
-let buttonWrapper;
-let buttonElem;
-let userIconElem;
-
-const findChildren = () => {
-  buttonElem = buttonWrapper.find('Button');
-  userIconElem = buttonWrapper.find('UserIcon');
-};
-
-describe('<LogoutButton />', () => {
-  test('initially renders without crashing', () => {
-    const onDevLogout = jest.fn();
-    buttonWrapper = mount(
-      <I18nProvider>
-        <LogoutButton onDevLogout={onDevLogout} />
-      </I18nProvider>
-    );
-    findChildren();
-    expect(buttonWrapper.length).toBe(1);
-    expect(buttonElem.length).toBe(1);
-    expect(userIconElem.length).toBe(1);
-    buttonElem.simulate('keyDown', { keyCode: 40, which: 40 });
-    expect(onDevLogout).toHaveBeenCalledTimes(0);
-    buttonElem.simulate('keyDown', { keyCode: 13, which: 13 });
-    expect(onDevLogout).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/src/App.jsx b/src/App.jsx
index 624242384d..04ca8c740f 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,29 +1,18 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { global_breakpoint_md } from '@patternfly/react-tokens';
-import {
-  Redirect,
-  Switch,
-  Route,
-} from 'react-router-dom';
 import {
   Nav,
   NavList,
   Page,
   PageHeader,
   PageSidebar,
-  Toolbar,
-  ToolbarGroup,
-  ToolbarItem
 } from '@patternfly/react-core';
 
-import api from './api';
-import { API_LOGOUT, API_CONFIG } from './endpoints';
-import { ConfigContext } from './context';
-
-import HelpDropdown from './components/HelpDropdown';
-import LogoutButton from './components/LogoutButton';
-import TowerLogo from './components/TowerLogo';
+import About from './components/About';
 import NavExpandableGroup from './components/NavExpandableGroup';
+import TowerLogo from './components/TowerLogo';
+import PageHeaderToolbar from './components/PageHeaderToolbar';
+import { ConfigContext } from './context';
 
 class App extends Component {
   constructor (props) {
@@ -34,14 +23,24 @@ class App extends Component {
       && window.innerWidth >= parseInt(global_breakpoint_md.value, 10);
 
     this.state = {
+      ansible_version: null,
+      version: null,
+      isAboutModalOpen: false,
       isNavOpen,
-      config: {},
-      error: false,
     };
 
+    this.fetchConfig = this.fetchConfig.bind(this);
     this.onLogout = this.onLogout.bind(this);
+    this.onAboutModalClose = this.onAboutModalClose.bind(this);
+    this.onAboutModalOpen = this.onAboutModalOpen.bind(this);
+    this.onLogoClick = this.onLogoClick.bind(this);
+    this.onNavToggle = this.onNavToggle.bind(this);
   };
 
+  componentDidMount () {
+    this.fetchConfig();
+  }
+
   async onLogout () {
     const { api } = this.props;
 
@@ -49,92 +48,102 @@ class App extends Component {
     window.location.replace('/#/login')
   }
 
-  onNavToggle = () => {
-    this.setState(({ isNavOpen }) => ({ isNavOpen: !isNavOpen }));
-  };
+  async fetchConfig () {
+    const { api } = this.props;
 
-  onLogoClick = () => {
-    this.setState({
-      activeGroup: 'views_group'
-    });
-  }
-
-  onDevLogout = async () => {
-    await api.get(API_LOGOUT);
-
-    this.setState({
-      activeGroup: 'views_group',
-      activeItem: 'views_group_dashboard',
-    });
-
-    window.location.replace('/#/login');
-  };
-
-  async componentDidMount() {
-    // Grab our config data from the API and store in state
     try {
-      const { data } = await api.get(API_CONFIG);
-      this.setState({ config: data });
-    } catch (error) {
-      this.setState({ error });
+      const { data: { ansible_version, version } } = await api.getConfig();
+      this.setState({ ansible_version, version });
+    } catch (err) {
+      this.setState({ ansible_version: null, version: null });
     }
   }
 
+  onAboutModalOpen () {
+    this.setState({ isAboutModalOpen: true });
+  }
+
+  onAboutModalClose () {
+    this.setState({ isAboutModalOpen: false });
+  }
+
+  onNavToggle () {
+    this.setState(({ isNavOpen }) => ({ isNavOpen: !isNavOpen }));
+  }
+
+  onLogoClick () {
+    this.setState({ activeGroup: 'views_group' });
+  }
+
   render () {
-    const { config, isNavOpen } = this.state;
+    const {
+      ansible_version,
+      isAboutModalOpen,
+      isNavOpen,
+      version,
+    } = this.state;
     const {
       render,
       routeGroups = [],
       navLabel = '',
     } = this.props;
 
+    const config = {
+      ansible_version,
+      version,
+    };
+
     return (
-      <ConfigContext.Provider value={config}>
+      <Fragment>
         <Page
           usecondensed="True"
           header={(
             <PageHeader
               showNavToggle
-              onNavToggle={() => this.onNavToggle()}
-              logo={(
+              onNavToggle={this.onNavToggle}
+              logo={
                 <TowerLogo
                   onClick={this.onLogoClick}
                 />
-              )}
-              toolbar={(
-                <Toolbar>
-                  <ToolbarGroup>
-                    <ToolbarItem>
-                      <HelpDropdown />
-                    </ToolbarItem>
-                    <ToolbarItem>
-                      <LogoutButton
-                        onDevLogout={this.onLogout}
-                      />
-                    </ToolbarItem>
-                  </ToolbarGroup>
-                </Toolbar>
-              )}
+              }
+              toolbar={
+                <PageHeaderToolbar
+                  isAboutDisabled={!version}
+                  onAboutClick={this.onAboutModalOpen}
+                  onLogoutClick={this.onLogout}
+                />
+              }
             />
           )}
-          sidebar={(
+          sidebar={
             <PageSidebar
               isNavOpen={isNavOpen}
               nav={(
                 <Nav aria-label={navLabel}>
                   <NavList>
                     {routeGroups.map(params => (
-                      <NavExpandableGroup key={params.groupId} {...params} />
+                      <NavExpandableGroup
+                        key={params.groupId}
+                        {...params}
+                      />
                     ))}
                   </NavList>
                 </Nav>
               )}
             />
-          )}
+          }
         >
-          { render ? render({ routeGroups }) : '' }
+          <ConfigContext.Provider value={config}>
+            { render ? render({ routeGroups }) : '' }
+          </ConfigContext.Provider>
         </Page>
-      </ConfigContext.Provider>
+        <About
+          ansible_version={ansible_version}
+          version={version}
+          isOpen={isAboutModalOpen}
+          onClose={this.onAboutModalClose}
+        />
+      </Fragment>
     );
   }
 }
diff --git a/src/components/About.jsx b/src/components/About.jsx
index 18c986fc7d..22c1157b30 100644
--- a/src/components/About.jsx
+++ b/src/components/About.jsx
@@ -1,5 +1,4 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import { I18n } from '@lingui/react';
 import { Trans, t } from '@lingui/macro';
 import {
@@ -13,10 +12,8 @@ import heroImg from '@patternfly/patternfly-next/assets/images/pfbg_992.jpg';
 import brandImg from '../../images/tower-logo-white.svg';
 import logoImg from '../../images/tower-logo-login.svg';
 
-import { ConfigContext } from '../context';
-
-class About extends React.Component {
-  createSpeechBubble = (version) => {
+class About extends Component {
+  static createSpeechBubble (version) {
     let text = `Tower ${version}`;
     let top = '';
     let bottom = '';
@@ -33,61 +30,60 @@ class About extends React.Component {
     return top + text + bottom;
   }
 
-  handleModalToggle = () => {
-    const { onAboutModalClose } = this.props;
-    onAboutModalClose();
-  };
+  constructor (props) {
+    super(props);
+
+    this.createSpeechBubble = this.constructor.createSpeechBubble.bind(this);
+  }
 
   render () {
-    const { isOpen } = this.props;
+    const {
+      ansible_version,
+      version,
+      isOpen,
+      onClose
+    } = this.props;
+
+    const speechBubble = this.createSpeechBubble(version);
+
     return (
       <I18n>
         {({ i18n }) => (
-          <ConfigContext.Consumer>
-            {({ ansible_version, version }) => (
-              <AboutModal
-                isOpen={isOpen}
-                onClose={this.handleModalToggle}
-                productName="Ansible Tower"
-                trademark={i18n._(t`Copyright 2018 Red Hat, Inc.`)}
-                brandImageSrc={brandImg}
-                brandImageAlt={i18n._(t`Brand Image`)}
-                logoImageSrc={logoImg}
-                logoImageAlt={i18n._(t`AboutModal Logo`)}
-                heroImageSrc={heroImg}
-              >
-                <pre>
-                  {this.createSpeechBubble(version)}
-                  {`
+          <AboutModal
+            isOpen={isOpen}
+            onClose={onClose}
+            productName="Ansible Tower"
+            trademark={i18n._(t`Copyright 2018 Red Hat, Inc.`)}
+            brandImageSrc={brandImg}
+            brandImageAlt={i18n._(t`Brand Image`)}
+            logoImageSrc={logoImg}
+            logoImageAlt={i18n._(t`AboutModal Logo`)}
+            heroImageSrc={heroImg}
+          >
+            <pre>
+              { speechBubble }
+              {`
               \\
-              \\  ^__^
+              \\   ^__^
                   (oo)\\_______
                   (__)      A )\\
                       ||----w |
                       ||     ||
                         `}
-                </pre>
-
-                <TextContent>
-                  <TextList component="dl">
-                    <TextListItem component="dt">
-                      <Trans>Ansible Version</Trans>
-                    </TextListItem>
-                    <TextListItem component="dd">{ansible_version}</TextListItem>
-                  </TextList>
-                </TextContent>
-              </AboutModal>
-            )}
-          </ConfigContext.Consumer>
+            </pre>
+            <TextContent>
+              <TextList component="dl">
+                <TextListItem component="dt">
+                  <Trans>Ansible Version</Trans>
+                </TextListItem>
+                <TextListItem component="dd">{ ansible_version }</TextListItem>
+              </TextList>
+            </TextContent>
+          </AboutModal>
         )}
       </I18n>
     );
   }
 }
 
-About.contextTypes = {
-  ansible_version: PropTypes.string,
-  version: PropTypes.string,
-};
-
 export default About;
diff --git a/src/components/HelpDropdown.jsx b/src/components/HelpDropdown.jsx
deleted file mode 100644
index ebe06e2417..0000000000
--- a/src/components/HelpDropdown.jsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, { Component, Fragment } from 'react';
-import { Trans } from '@lingui/macro';
-import {
-  Dropdown,
-  DropdownItem,
-  DropdownToggle,
-  DropdownPosition,
-} from '@patternfly/react-core';
-import { QuestionCircleIcon } from '@patternfly/react-icons';
-import AboutModal from './About';
-
-class HelpDropdown extends Component {
-  state = {
-    isOpen: false,
-    showAboutModal: false
-  };
-
-  render () {
-    const { isOpen, showAboutModal } = this.state;
-    const dropdownItems = [
-      <DropdownItem
-        href="https://docs.ansible.com/ansible-tower/latest/html/userguide/index.html"
-        target="_blank"
-        key="help"
-      >
-        <Trans>Help</Trans>
-      </DropdownItem>,
-      <DropdownItem
-        onClick={() => this.setState({ showAboutModal: true })}
-        key="about"
-      >
-        <Trans>About</Trans>
-      </DropdownItem>
-    ];
-
-    return (
-      <Fragment>
-        <Dropdown
-          onSelect={() => this.setState({ isOpen: !isOpen })}
-          toggle={(
-            <DropdownToggle onToggle={(isToggleOpen) => this.setState({ isOpen: isToggleOpen })}>
-              <QuestionCircleIcon />
-            </DropdownToggle>
-          )}
-          isOpen={isOpen}
-          dropdownItems={dropdownItems}
-          position={DropdownPosition.right}
-        />
-        {showAboutModal
-          ? (
-            <AboutModal
-              isOpen={showAboutModal}
-              onAboutModalClose={() => this.setState({ showAboutModal: !showAboutModal })}
-            />
-          )
-          : null }
-      </Fragment>
-    );
-  }
-}
-
-export default HelpDropdown;
diff --git a/src/components/LogoutButton.jsx b/src/components/LogoutButton.jsx
deleted file mode 100644
index 4f42813374..0000000000
--- a/src/components/LogoutButton.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import { I18n } from '@lingui/react';
-import { t } from '@lingui/macro';
-
-import {
-  Button,
-  ButtonVariant
-} from '@patternfly/react-core';
-
-import { UserIcon } from '@patternfly/react-icons';
-
-const LogoutButton = ({ onDevLogout }) => (
-  <I18n>
-    {({ i18n }) => (
-      <Button
-        id="button-logout"
-        aria-label={i18n._(t`Logout`)}
-        variant={ButtonVariant.plain}
-        onClick={onDevLogout}
-        onKeyDown={event => {
-          if (event.keyCode === 13) {
-            onDevLogout();
-          }
-        }}
-      >
-        <UserIcon />
-      </Button>
-    )}
-  </I18n>
-);
-
-export default LogoutButton;
diff --git a/src/components/PageHeaderToolbar.jsx b/src/components/PageHeaderToolbar.jsx
new file mode 100644
index 0000000000..ee56c4119a
--- /dev/null
+++ b/src/components/PageHeaderToolbar.jsx
@@ -0,0 +1,140 @@
+import React, { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+import { t } from '@lingui/macro';
+import { I18n } from '@lingui/react';
+import {
+  Dropdown,
+  DropdownItem,
+  DropdownToggle,
+  DropdownPosition,
+  Toolbar,
+  ToolbarGroup,
+  ToolbarItem,
+} from '@patternfly/react-core';
+import {
+  QuestionCircleIcon,
+  UserIcon,
+} from '@patternfly/react-icons';
+
+const DOCLINK = 'https://docs.ansible.com/ansible-tower/latest/html/userguide/index.html';
+const KEY_ENTER = 13;
+
+class PageHeaderToolbar extends Component {
+  constructor (props) {
+    super(props);
+    this.state = { isHelpOpen: false, isUserOpen: false };
+
+    this.onHelpSelect = this.onHelpSelect.bind(this);
+    this.onHelpToggle = this.onHelpToggle.bind(this);
+    this.onLogoutKeyDown = this.onLogoutKeyDown.bind(this);
+    this.onUserSelect = this.onUserSelect.bind(this);
+    this.onUserToggle = this.onUserToggle.bind(this);
+  }
+
+  onLogoutKeyDown ({ keyCode }) {
+    const { onLogoutClick } = this.props;
+
+    if (keyCode === KEY_ENTER) {
+      onLogoutClick();
+    }
+  }
+
+  onHelpSelect () {
+    const { isHelpOpen } = this.state;
+
+    this.setState({ isHelpOpen: !isHelpOpen });
+  }
+
+  onUserSelect () {
+    const { isUserOpen } = this.state;
+
+    this.setState({ isUserOpen: !isUserOpen });
+  }
+
+  onHelpToggle (isOpen) {
+    this.setState({ isHelpOpen: isOpen });
+  }
+
+  onUserToggle (isOpen) {
+    this.setState({ isUserOpen: isOpen });
+  }
+
+  render () {
+    const { isHelpOpen, isUserOpen } = this.state;
+    const { isAboutDisabled, onAboutClick, onLogoutClick } = this.props;
+
+    return (
+      <I18n>
+        {({ i18n }) => (
+          <Toolbar>
+            <ToolbarGroup>
+              <ToolbarItem>
+                <Dropdown
+                  isOpen={isHelpOpen}
+                  position={DropdownPosition.right}
+                  onSelect={this.onHelpSelect}
+                  toggle={(
+                    <DropdownToggle
+                      onToggle={this.onHelpToggle}
+                    >
+                      <QuestionCircleIcon />
+                    </DropdownToggle>
+                  )}
+                  dropdownItems={[
+                    <DropdownItem
+                      key="help"
+                      target="_blank"
+                      href={DOCLINK}
+                    >
+                      {i18n._(t`Help`)}
+                    </DropdownItem>,
+                    <DropdownItem
+                      key="about"
+                      component="button"
+                      isDisabled={isAboutDisabled}
+                      onClick={onAboutClick}
+                    >
+                      {i18n._(t`About`)}
+                    </DropdownItem>
+                  ]}
+                />
+              </ToolbarItem>
+              <ToolbarItem>
+                <Dropdown
+                  isOpen={isUserOpen}
+                  position={DropdownPosition.right}
+                  onSelect={this.onUserSelect}
+                  toggle={(
+                    <DropdownToggle
+                      onToggle={this.onUserToggle}
+                    >
+                      <UserIcon />
+                    </DropdownToggle>
+                  )}
+                  dropdownItems={[
+                    <DropdownItem key="user">
+                      <Link to="/home">
+                        {i18n._(t`User Details`)}
+                      </Link>
+                    </DropdownItem>,
+                    <DropdownItem
+                      key="logout"
+                      component="button"
+                      onClick={onLogoutClick}
+                      onKeyDown={this.onLogoutKeyDown}
+                    >
+                      {i18n._(t`Logout`)}
+                    </DropdownItem>
+                  ]}
+                />
+              </ToolbarItem>
+            </ToolbarGroup>
+          </Toolbar>
+        )}
+      </I18n>
+    );
+  }
+}
+
+export default PageHeaderToolbar;
diff --git a/src/endpoints.jsx b/src/endpoints.jsx
deleted file mode 100644
index d1499b00d6..0000000000
--- a/src/endpoints.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export const API_ROOT = '/api/';
-export const API_LOGIN = `${API_ROOT}login/`;
-export const API_LOGOUT = `${API_ROOT}logout/`;
-export const API_V2 = `${API_ROOT}v2/`;
-export const API_CONFIG = `${API_V2}config/`;
-export const API_PROJECTS = `${API_V2}projects/`;
-export const API_ORGANIZATIONS = `${API_V2}organizations/`;
\ No newline at end of file