diff --git a/src/components/AccessList/Access.list.jsx b/src/components/AccessList/Access.list.jsx
index 23e02cf497..1df8377ddf 100644
--- a/src/components/AccessList/Access.list.jsx
+++ b/src/components/AccessList/Access.list.jsx
@@ -16,6 +16,7 @@ import {
 import BasicChip from '../BasicChip/BasicChip';
 import Pagination from '../Pagination';
 import DataListToolbar from '../DataListToolbar';
+import Tooltip from '../Tooltip';
 
 import {
   parseQueryString,
@@ -46,6 +47,15 @@ const hiddenStyle = {
   display: 'none',
 };
 
+const badgeStyle = {
+  borderRadius: 'var(--pf-global--BorderRadius--sm)',
+  height: '24px',
+}
+
+const badgeTextStyle = {
+  lineHeight: '24px',
+}
+
 const Detail = ({ label, value, url, isBadge, customStyles }) => {
   let detail = null;
   if (value) {
@@ -57,8 +67,8 @@ const Detail = ({ label, value, url, isBadge, customStyles }) => {
           </Link>) : (<Text component={TextVariants.h6} style={detailLabelStyle}>{label}</Text>
         )}
         {isBadge ? (
-          <Badge isRead>
-            <Text component={TextVariants.p} style={detailValueStyle}>{value}</Text>
+          <Badge style={badgeStyle} isRead>
+            <Text component={TextVariants.p} style={{...detailValueStyle, ...badgeTextStyle}}>{value}</Text>
           </Badge>
         ) : (
           <Text component={TextVariants.p} style={detailValueStyle}>{value}</Text>
@@ -93,7 +103,7 @@ class AccessList extends React.Component {
       count: null,
       sortOrder: 'ascending',
       sortedColumnKey: 'username',
-      isCompact: true,
+      isCompact: false,
     };
 
     this.fetchOrgAccessList = this.fetchOrgAccessList.bind(this);
@@ -321,12 +331,30 @@ class AccessList extends React.Component {
                               : userRolesWrapperStyle}
                             >
                               <Text component={TextVariants.h6} style={detailLabelStyle}>{i18n._(t`User Roles`)}</Text>
-                              {result.userRoles.map(role => (
-                                <BasicChip
-                                  key={role.id}
-                                  text={role.name}
-                                />
-                              ))}
+                              {result.userRoles.map(role => {
+                                // Show tooltips for associated Org/Team of role name displayed
+                                if (role.summary_fields.resource_name) {
+                                  return (
+                                    <Tooltip
+                                      message={role.summary_fields.resource_name}
+                                      position="top"
+                                      key={role.id}
+                                    >
+                                       <BasicChip
+                                        key={role.id}
+                                        text={role.name}
+                                      />
+                                    </Tooltip>
+                                  )
+                                } else {
+                                  return (
+                                    <BasicChip
+                                      key={role.id}
+                                      text={role.name}
+                                    />
+                                  )
+                                }
+                              })}
                             </ul>
                           )}
                           {result.teamRoles.length > 0 && (
diff --git a/src/components/DataListToolbar/DataListToolbar.jsx b/src/components/DataListToolbar/DataListToolbar.jsx
index 074b804e58..3968d4742d 100644
--- a/src/components/DataListToolbar/DataListToolbar.jsx
+++ b/src/components/DataListToolbar/DataListToolbar.jsx
@@ -261,16 +261,6 @@ class DataListToolbar extends React.Component {
                   </ToolbarGroup>
                   {showExpandCollapse && (
                     <ToolbarGroup>
-                      <ToolbarItem>
-                        <Button
-                          variant="plain"
-                          aria-label={i18n._(t`Expand`)}
-                          onClick={this.onExpand}
-                          style={!isCompact ? ToolbarActiveStyle : null}
-                        >
-                          <EqualsIcon />
-                        </Button>
-                      </ToolbarItem>
                       <ToolbarItem>
                         <Button
                           variant="plain"
@@ -281,6 +271,16 @@ class DataListToolbar extends React.Component {
                           <BarsIcon />
                         </Button>
                       </ToolbarItem>
+                      <ToolbarItem>
+                        <Button
+                          variant="plain"
+                          aria-label={i18n._(t`Expand`)}
+                          onClick={this.onExpand}
+                          style={!isCompact ? ToolbarActiveStyle : null}
+                        >
+                          <EqualsIcon />
+                        </Button>
+                      </ToolbarItem>
                       { (showDelete || addUrl) && (
                         <VerticalSeparator />
                       )}
diff --git a/src/components/Tooltip/Tooltip.jsx b/src/components/Tooltip/Tooltip.jsx
index 2ecb1ce832..c3d8a2ac4f 100644
--- a/src/components/Tooltip/Tooltip.jsx
+++ b/src/components/Tooltip/Tooltip.jsx
@@ -1,6 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
+const toolTipContent = {
+  padding: '10px',
+  minWidth: '100px',
+}
+
 class Tooltip extends React.Component {
   transforms = {
     top: {
@@ -42,7 +47,10 @@ class Tooltip extends React.Component {
     const {
       isDisplayed
     } = this.state;
-
+    
+    if (message === '') {
+      return null;
+    }
     return (
       <span
         style={{ position: 'relative' }}
@@ -56,8 +64,8 @@ class Tooltip extends React.Component {
               style={{ position: 'absolute', zIndex: '10', ...this.transforms[position] }}
               className={`pf-c-tooltip pf-m-${position}`}
             >
-              <div className="pf-c-tooltip__arrow" />
-              <div className="pf-c-tooltip__content">
+              <div className="pf-c-tooltip__arrow"/>
+              <div className="pf-c-tooltip__content" style={toolTipContent}>
                 { message }
               </div>
             </div>