diff --git a/src/actions/actionTypes.ts b/src/actions/actionTypes.ts
index e3f754e31b..beaad885eb 100644
--- a/src/actions/actionTypes.ts
+++ b/src/actions/actionTypes.ts
@@ -46,6 +46,7 @@ export const FETCH_ASSESSMENT_OVERVIEWS = 'FETCH_ASSESSMENT_OVERVIEWS'
 export const FETCH_GRADING = 'FETCH_GRADING'
 export const FETCH_GRADING_OVERVIEWS = 'FETCH_GRADING_OVERVIEWS'
 export const LOGIN = 'LOGIN'
+export const SET_ROLE = 'SET_ROLE'
 export const SET_TOKENS = 'SET_TOKENS'
 export const SET_USERNAME = 'SET_USERNAME'
 export const UPDATE_HISTORY_HELPERS = 'UPDATE_HISTORY_HELPERS'
diff --git a/src/actions/session.ts b/src/actions/session.ts
index f309ec26a3..9007294f2c 100644
--- a/src/actions/session.ts
+++ b/src/actions/session.ts
@@ -4,6 +4,8 @@ import { Grading, GradingOverview } from '../components/academy/grading/gradingS
 import { IAssessment, IAssessmentOverview } from '../components/assessment/assessmentShape'
 import * as actionTypes from './actionTypes'
 
+import { Role } from '../reducers/states'
+
 export const fetchAuth: ActionCreator<actionTypes.IAction> = (ivleToken: string) => ({
   type: actionTypes.FETCH_AUTH,
   payload: ivleToken
@@ -35,6 +37,11 @@ export const login = () => ({
   type: actionTypes.LOGIN
 })
 
+export const setRole: ActionCreator<actionTypes.IAction> = (role: Role) => ({
+  type: actionTypes.SET_ROLE,
+  payload: role
+})
+
 export const setTokens: ActionCreator<actionTypes.IAction> = ({ accessToken, refreshToken }) => ({
   type: actionTypes.SET_TOKENS,
   payload: {
diff --git a/src/components/Application.tsx b/src/components/Application.tsx
index 19b9b4f44e..4178061b48 100644
--- a/src/components/Application.tsx
+++ b/src/components/Application.tsx
@@ -7,13 +7,14 @@ import Academy from '../containers/academy'
 import Announcements from '../containers/AnnouncementsContainer'
 import Login from '../containers/LoginContainer'
 import Playground from '../containers/PlaygroundContainer'
-import { sourceChapters } from '../reducers/states'
+import { Role, sourceChapters } from '../reducers/states'
 import NavigationBar from './NavigationBar'
 import NotFound from './NotFound'
 
 export interface IApplicationProps extends IDispatchProps, RouteComponentProps<{}> {
   title: string
   accessToken?: string
+  role?: Role
   username?: string
 }
 
@@ -29,14 +30,13 @@ const Application: React.SFC<IApplicationProps> = props => {
 
   return (
     <div className="Application">
-      <NavigationBar title={props.title} username={props.username} />
+      <NavigationBar title={props.title} username={props.username} role={props.role} />
       <div className="Application__main">
         <Switch>
           <Route path="/academy" component={toAcademy(props)} />
           <Route path="/news" component={Announcements} />
           <Route path="/material" component={Announcements} />
           <Route path="/playground" component={Playground} />
-          <Route path="/status" component={Announcements} />
           <Route path="/login" render={toLogin(props)} />
           <Route exact={true} path="/" render={redirectToNews} />
           <Route component={NotFound} />
@@ -52,9 +52,9 @@ const Application: React.SFC<IApplicationProps> = props => {
  *  2. If the user is not logged in, redirect to /login
  */
 const toAcademy = (props: IApplicationProps) =>
-  props.accessToken === undefined
+  props.accessToken === undefined || props.role === undefined
     ? () => <Redirect to="/login" />
-    : () => <Academy accessToken={props.accessToken} />
+    : () => <Academy accessToken={props.accessToken} role={props.role!} />
 
 const toLogin = (props: IApplicationProps) => () => (
   <Login ivleToken={qs.parse(props.location.search).token} />
diff --git a/src/components/NavigationBar.tsx b/src/components/NavigationBar.tsx
index 1e1806a72e..cdf4b96512 100644
--- a/src/components/NavigationBar.tsx
+++ b/src/components/NavigationBar.tsx
@@ -1,18 +1,15 @@
-import {
-  Alignment,
-  Icon,
-  Navbar,
-  NavbarDivider,
-  NavbarGroup,
-  NavbarHeading
-} from '@blueprintjs/core'
+import { Alignment, Icon, Navbar, NavbarGroup, NavbarHeading } from '@blueprintjs/core'
 import { IconNames } from '@blueprintjs/icons'
 import * as React from 'react'
 import { NavLink } from 'react-router-dom'
 
+import { Role } from '../reducers/states'
+import Status from './academy/Status'
+
 export interface INavigationBarProps {
   title: string
   username?: string
+  role?: Role
 }
 
 const NavigationBar: React.SFC<INavigationBarProps> = props => (
@@ -56,31 +53,13 @@ const NavigationBar: React.SFC<INavigationBarProps> = props => (
         <div className="navbar-button-text hidden-xs">Playground</div>
       </NavLink>
 
-      {props.username === undefined ? (
-        undefined
+      {props.username !== undefined && props.role !== undefined ? (
+        <Status username={props.username} role={props.role} />
       ) : (
-        <>
-          <div className="visible-xs">
-            <NavbarDivider className="thin-divider" />
-          </div>
-          <div className="hidden-xs">
-            <NavbarDivider className="default-divider" />
-          </div>
-          <NavLink
-            to="/status"
-            activeClassName="pt-active"
-            className="NavigationBar__link pt-button pt-minimal"
-          >
-            <Icon icon={IconNames.USER} />
-            <div className="navbar-button-text hidden-xs">{titleCase(props.username)}</div>
-          </NavLink>
-        </>
+        undefined
       )}
     </NavbarGroup>
   </Navbar>
 )
 
-const titleCase = (str: string) =>
-  str.replace(/\w\S*/g, wrd => wrd.charAt(0).toUpperCase() + wrd.substr(1).toLowerCase())
-
 export default NavigationBar
diff --git a/src/components/__tests__/__snapshots__/Application.tsx.snap b/src/components/__tests__/__snapshots__/Application.tsx.snap
index 4a05d50af1..8b1788eb9d 100644
--- a/src/components/__tests__/__snapshots__/Application.tsx.snap
+++ b/src/components/__tests__/__snapshots__/Application.tsx.snap
@@ -2,14 +2,13 @@
 
 exports[`Application renders correctly 1`] = `
 "<div className=\\"Application\\">
-  <NavigationBar title=\\"Cadet\\" username={[undefined]} />
+  <NavigationBar title=\\"Cadet\\" username={[undefined]} role={[undefined]} />
   <div className=\\"Application__main\\">
     <Switch>
       <Route path=\\"/academy\\" component={[Function]} />
       <Route path=\\"/news\\" component={[Function: Connect]} />
       <Route path=\\"/material\\" component={[Function: Connect]} />
       <Route path=\\"/playground\\" component={[Function: C]} />
-      <Route path=\\"/status\\" component={[Function: Connect]} />
       <Route path=\\"/login\\" render={[Function]} />
       <Route exact={true} path=\\"/\\" render={[Function: redirectToNews]} />
       <Route component={[Function: NotFound]} />
diff --git a/src/components/__tests__/__snapshots__/NavigationBar.tsx.snap b/src/components/__tests__/__snapshots__/NavigationBar.tsx.snap
index 8503a80cce..be3615db09 100644
--- a/src/components/__tests__/__snapshots__/NavigationBar.tsx.snap
+++ b/src/components/__tests__/__snapshots__/NavigationBar.tsx.snap
@@ -62,20 +62,6 @@ exports[`NavigationBar renders correctly with username 1`] = `
         Playground
       </div>
     </NavLink>
-    <Symbol(react.fragment)>
-      <div className=\\"visible-xs\\">
-        <Blueprint2.NavbarDivider className=\\"thin-divider\\" />
-      </div>
-      <div className=\\"hidden-xs\\">
-        <Blueprint2.NavbarDivider className=\\"default-divider\\" />
-      </div>
-      <NavLink to=\\"/status\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
-        <Blueprint2.Icon icon=\\"user\\" />
-        <div className=\\"navbar-button-text hidden-xs\\">
-          Evis Rucer
-        </div>
-      </NavLink>
-    </Symbol(react.fragment)>
   </Blueprint2.NavbarGroup>
 </Blueprint2.Navbar>"
 `;
diff --git a/src/components/academy/NavigationBar.tsx b/src/components/academy/NavigationBar.tsx
index 3001130adc..d91f03ced0 100644
--- a/src/components/academy/NavigationBar.tsx
+++ b/src/components/academy/NavigationBar.tsx
@@ -3,10 +3,17 @@ import { IconNames } from '@blueprintjs/icons'
 import * as React from 'react'
 import { NavLink } from 'react-router-dom'
 
+import { Role } from '../../reducers/states'
 import { assessmentCategoryLink } from '../../utils/paramParseHelpers'
 import { AssessmentCategories } from '../assessment/assessmentShape'
 
-const NavigationBar: React.SFC<{}> = () => (
+type NavigationBarProps = OwnProps
+
+type OwnProps = {
+  role: Role
+}
+
+const NavigationBar: React.SFC<NavigationBarProps> = props => (
   <Navbar className="NavigationBar secondary-navbar">
     <NavbarGroup align={Alignment.LEFT}>
       <NavLink
@@ -45,16 +52,18 @@ const NavigationBar: React.SFC<{}> = () => (
         <div className="navbar-button-text hidden-xs">Contests</div>
       </NavLink>
     </NavbarGroup>
-    <NavbarGroup align={Alignment.RIGHT}>
-      <NavLink
-        to={`/academy/grading`}
-        activeClassName="pt-active"
-        className="NavigationBar__link pt-button pt-minimal"
-      >
-        <Icon icon={IconNames.ENDORSED} />
-        <div className="navbar-button-text hidden-xs">Grading</div>
-      </NavLink>
-    </NavbarGroup>
+    {props.role === Role.Admin || props.role === Role.Staff ? (
+      <NavbarGroup align={Alignment.RIGHT}>
+        <NavLink
+          to={'/academy/grading'}
+          activeClassName="pt-active"
+          className="NavigationBar__link pt-button pt-minimal"
+        >
+          <Icon icon={IconNames.ENDORSED} />
+          <div className="navbar-button-text hidden-xs">Grading</div>
+        </NavLink>
+      </NavbarGroup>
+    ) : null}
   </Navbar>
 )
 
diff --git a/src/components/academy/Status.tsx b/src/components/academy/Status.tsx
new file mode 100644
index 0000000000..cadda584e9
--- /dev/null
+++ b/src/components/academy/Status.tsx
@@ -0,0 +1,37 @@
+import { NavbarDivider, Popover, Text } from '@blueprintjs/core'
+import { IconNames } from '@blueprintjs/icons'
+import * as React from 'react'
+
+import { Role } from '../../reducers/states'
+import { controlButton } from '../commons'
+
+type StatusProps = OwnProps
+
+type OwnProps = {
+  username: string
+  role: Role
+}
+
+const Status: React.SFC<StatusProps> = props => (
+  <>
+    <div className="visible-xs">
+      <NavbarDivider className="thin-divider" />
+    </div>
+    <div className="hidden-xs">
+      <NavbarDivider className="default-divider" />
+    </div>
+    <Popover popoverClassName="Popover-share pt-dark" inheritDarkTheme={true}>
+      <div className="navbar-button-text hidden-xs">
+        {controlButton(titleCase(props.username), IconNames.USER)}
+      </div>
+      <Text>
+        <h4>{`Source Academy, ${titleCase(props.role)}`}</h4>
+      </Text>
+    </Popover>
+  </>
+)
+
+const titleCase = (str: string) =>
+  str.replace(/\w\S*/g, wrd => wrd.charAt(0).toUpperCase() + wrd.substr(1).toLowerCase())
+
+export default Status
diff --git a/src/components/academy/__tests__/NavigationBar.tsx b/src/components/academy/__tests__/NavigationBar.tsx
new file mode 100644
index 0000000000..6d6de8f361
--- /dev/null
+++ b/src/components/academy/__tests__/NavigationBar.tsx
@@ -0,0 +1,32 @@
+import { shallow } from 'enzyme'
+import * as React from 'react'
+
+import { Role } from '../../../reducers/states'
+import NavigationBar from '../NavigationBar'
+
+test('Grading NavLink does NOT renders for Role.Student', () => {
+  const props = { role: Role.Student }
+  const tree = shallow(<NavigationBar {...props} />)
+  expect(tree.debug()).toMatchSnapshot()
+  expect(
+    tree.filterWhere(shallowTree => shallowTree.find({ to: 'academy/grading' }).exists())
+  ).toHaveLength(0)
+})
+
+test('Grading NavLink renders for Role.Staff', () => {
+  const props = { role: Role.Staff }
+  const tree = shallow(<NavigationBar {...props} />)
+  expect(tree.debug()).toMatchSnapshot()
+  expect(
+    tree.filterWhere(shallowTree => shallowTree.find({ to: '/academy/grading' }).exists())
+  ).toHaveLength(1)
+})
+
+test('Grading NavLink renders for Role.Admin', () => {
+  const props = { role: Role.Admin }
+  const tree = shallow(<NavigationBar {...props} />)
+  expect(tree.debug()).toMatchSnapshot()
+  expect(
+    tree.filterWhere(shallowTree => shallowTree.find({ to: '/academy/grading' }).exists())
+  ).toHaveLength(1)
+})
diff --git a/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap b/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap
new file mode 100644
index 0000000000..6ee9d6815c
--- /dev/null
+++ b/src/components/academy/__tests__/__snapshots__/NavigationBar.tsx.snap
@@ -0,0 +1,110 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Grading NavLink does NOT renders for Role.Student 1`] = `
+"<Blueprint2.Navbar className=\\"NavigationBar secondary-navbar\\">
+  <Blueprint2.NavbarGroup align=\\"left\\">
+    <NavLink to=\\"/academy/missions\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"flame\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Missions
+      </div>
+    </NavLink>
+    <NavLink to=\\"/academy/sidequests\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"lightbulb\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Sidequests
+      </div>
+    </NavLink>
+    <NavLink to=\\"/academy/paths\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"predictive-analysis\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Paths
+      </div>
+    </NavLink>
+    <NavLink to=\\"/academy/contests\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"comparison\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Contests
+      </div>
+    </NavLink>
+  </Blueprint2.NavbarGroup>
+</Blueprint2.Navbar>"
+`;
+
+exports[`Grading NavLink renders for Role.Admin 1`] = `
+"<Blueprint2.Navbar className=\\"NavigationBar secondary-navbar\\">
+  <Blueprint2.NavbarGroup align=\\"left\\">
+    <NavLink to=\\"/academy/missions\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"flame\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Missions
+      </div>
+    </NavLink>
+    <NavLink to=\\"/academy/sidequests\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"lightbulb\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Sidequests
+      </div>
+    </NavLink>
+    <NavLink to=\\"/academy/paths\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"predictive-analysis\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Paths
+      </div>
+    </NavLink>
+    <NavLink to=\\"/academy/contests\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"comparison\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Contests
+      </div>
+    </NavLink>
+  </Blueprint2.NavbarGroup>
+  <Blueprint2.NavbarGroup align=\\"right\\">
+    <NavLink to=\\"/academy/grading\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"endorsed\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Grading
+      </div>
+    </NavLink>
+  </Blueprint2.NavbarGroup>
+</Blueprint2.Navbar>"
+`;
+
+exports[`Grading NavLink renders for Role.Staff 1`] = `
+"<Blueprint2.Navbar className=\\"NavigationBar secondary-navbar\\">
+  <Blueprint2.NavbarGroup align=\\"left\\">
+    <NavLink to=\\"/academy/missions\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"flame\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Missions
+      </div>
+    </NavLink>
+    <NavLink to=\\"/academy/sidequests\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"lightbulb\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Sidequests
+      </div>
+    </NavLink>
+    <NavLink to=\\"/academy/paths\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"predictive-analysis\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Paths
+      </div>
+    </NavLink>
+    <NavLink to=\\"/academy/contests\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"comparison\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Contests
+      </div>
+    </NavLink>
+  </Blueprint2.NavbarGroup>
+  <Blueprint2.NavbarGroup align=\\"right\\">
+    <NavLink to=\\"/academy/grading\\" activeClassName=\\"pt-active\\" className=\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent=\\"true\\">
+      <Blueprint2.Icon icon=\\"endorsed\\" />
+      <div className=\\"navbar-button-text hidden-xs\\">
+        Grading
+      </div>
+    </NavLink>
+  </Blueprint2.NavbarGroup>
+</Blueprint2.Navbar>"
+`;
diff --git a/src/components/academy/index.tsx b/src/components/academy/index.tsx
index b9d8ed9cd6..6ec690e380 100644
--- a/src/components/academy/index.tsx
+++ b/src/components/academy/index.tsx
@@ -5,6 +5,7 @@ import Grading from '../../containers/academy/grading'
 import AssessmentContainer from '../../containers/assessment'
 import Game from '../../containers/GameContainer'
 import { isAcademyRe } from '../../reducers/session'
+import { Role } from '../../reducers/states'
 import { HistoryHelper } from '../../utils/history'
 import { assessmentCategoryLink } from '../../utils/paramParseHelpers'
 import { AssessmentCategories, AssessmentCategory } from '../assessment/assessmentShape'
@@ -14,6 +15,7 @@ interface IAcademyProps extends IOwnProps, IStateProps, RouteComponentProps<{}>
 
 export interface IOwnProps {
   accessToken?: string
+  role: Role
 }
 
 export interface IStateProps {
@@ -29,7 +31,7 @@ const gradingRegExp = ':submissionId(\\d+)?/:questionId(\\d+)?'
 
 export const Academy: React.SFC<IAcademyProps> = props => (
   <div className="Academy">
-    <AcademyNavigationBar />
+    <AcademyNavigationBar role={props.role} />
     <Switch>
       <Route
         path={`/academy/${assessmentCategoryLink(
diff --git a/src/containers/ApplicationContainer.ts b/src/containers/ApplicationContainer.ts
index c13c3effed..15a874d8a9 100644
--- a/src/containers/ApplicationContainer.ts
+++ b/src/containers/ApplicationContainer.ts
@@ -16,6 +16,7 @@ import { IState } from '../reducers/states'
 const mapStateToProps: MapStateToProps<{ title: string }, {}, IState> = state => ({
   title: state.application.title,
   accessToken: state.session.accessToken,
+  role: state.session.role,
   username: state.session.username
 })
 
diff --git a/src/reducers/session.ts b/src/reducers/session.ts
index 91a04ec6aa..2cc7c722c9 100644
--- a/src/reducers/session.ts
+++ b/src/reducers/session.ts
@@ -2,6 +2,7 @@ import { Reducer } from 'redux'
 
 import {
   IAction,
+  SET_ROLE,
   SET_TOKENS,
   SET_USERNAME,
   UPDATE_ASSESSMENT,
@@ -14,6 +15,11 @@ import { defaultSession, ISessionState } from './states'
 
 export const reducer: Reducer<ISessionState> = (state = defaultSession, action: IAction) => {
   switch (action.type) {
+    case SET_ROLE:
+      return {
+        ...state,
+        role: action.payload
+      }
     case SET_TOKENS:
       return {
         ...state,
diff --git a/src/reducers/states.ts b/src/reducers/states.ts
index a776c6b7a0..cd3edf4739 100644
--- a/src/reducers/states.ts
+++ b/src/reducers/states.ts
@@ -58,6 +58,7 @@ export interface ISessionState {
   readonly gradings: Map<number, Grading>
   readonly historyHelper: HistoryHelper
   readonly refreshToken?: string
+  readonly role?: Role
   readonly storyAct: string
   readonly username?: string
 }
@@ -114,6 +115,12 @@ export enum ApplicationEnvironment {
   Test = 'test'
 }
 
+export enum Role {
+  Student = 'student',
+  Staff = 'staff',
+  Admin = 'admin'
+}
+
 export const sourceChapters = [1, 2]
 const latestSourceChapter = sourceChapters.slice(-1)[0]
 
diff --git a/src/sagas/backend.ts b/src/sagas/backend.ts
index a91e9b9f52..9700ec8ce9 100644
--- a/src/sagas/backend.ts
+++ b/src/sagas/backend.ts
@@ -21,15 +21,16 @@ function* backendSaga(): SagaIterator {
       accessToken: resp.access_token,
       refreshToken: resp.refresh_token
     }
-    const username = yield getUsername(tokens.accessToken)
+    const user = yield getUser(tokens.accessToken)
     yield put(actions.setTokens(tokens))
-    yield put(actions.setUsername(username))
+    yield put(actions.setRole(user.role))
+    yield put(actions.setUsername(user.name))
     yield delay(2000)
     yield history.push('/academy')
   })
 }
 
-function* getUsername(accessToken: string) {
+function* getUser(accessToken: string) {
   const resp = yield call(request, 'user', {
     method: 'GET',
     headers: new Headers({
@@ -37,7 +38,7 @@ function* getUsername(accessToken: string) {
       Accept: 'application/json'
     })
   })
-  return resp.name
+  return resp
 }
 
 function request(path: string, opts: {}) {
diff --git a/src/styles/_navigationBar.scss b/src/styles/_navigationBar.scss
index f86c1ba25c..ecadca6df0 100644
--- a/src/styles/_navigationBar.scss
+++ b/src/styles/_navigationBar.scss
@@ -33,6 +33,16 @@
   .pt-navbar-heading {
     text-transform: uppercase;
   }
+
+  .navbar-username {
+    margin-left: 0;
+  }
+}
+
+.Popover-share {
+  h4 {
+    margin: 0.3rem 0 0.3rem 0;
+  }
 }
 
 /*
diff --git a/src/styles/_workspace.scss b/src/styles/_workspace.scss
index d12e03d853..a16a210ae6 100644
--- a/src/styles/_workspace.scss
+++ b/src/styles/_workspace.scss
@@ -276,7 +276,7 @@ $code-color-error: #ff4444;
   .pt-popover-content {
     background: $cadet-color-4;
     display: flex;
-    padding: 0.4rem 0.4rem 0.4rem 0.8rem;
+    padding: 0.4rem 0.8rem 0.4rem 0.8rem;
 
     input {
       width: 25rem;
@@ -285,6 +285,10 @@ $code-color-error: #ff4444;
         outline: none;
       }
     }
+
+    button {
+      padding: 5px 5px 5px 10px;
+    }
   }
 }