diff --git a/src/app.scss b/src/app.scss
index ac24b14112..08584353af 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -150,4 +150,31 @@
   display: flex;
   flex-direction: row;
   justify-content: flex-end;
+}
+
+.awx-c-list {
+  border-top: 1px solid #d7d7d7;
+  border-bottom: 1px solid #d7d7d7;
+}
+
+.awx-c-modal {
+  width: 550px;
+  margin: 0;
+}
+
+.pf-c-modal-box__footer {
+  --pf-c-modal-box__footer--PaddingTop: 0;
+  --pf-c-modal-box__footer--PaddingBottom: 0;
+}
+
+.pf-c-modal-box__header {
+  --pf-c-modal-box__header--PaddingTop: 10px;
+  --pf-c-modal-box__header--PaddingRight: 0;
+  --pf-c-modal-box__header--PaddingBottom: 0;
+  --pf-c-modal-box__header--PaddingLeft: 20px;
+}
+
+.pf-c-modal-box__body {
+  --pf-c-modal-box__body--PaddingLeft: 20px;
+  --pf-c-modal-box__body--PaddingRight: 20px;
 }
\ No newline at end of file
diff --git a/src/components/ListItem/ListItem.jsx b/src/components/ListItem/ListItem.jsx
new file mode 100644
index 0000000000..dea68b2030
--- /dev/null
+++ b/src/components/ListItem/ListItem.jsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { I18n } from '@lingui/react';
+import { t } from '@lingui/macro';
+import {
+  Checkbox,
+} from '@patternfly/react-core';
+
+export default ({
+  itemId,
+  name,
+  isSelected,
+  onSelect,
+}) => (
+    <li key={itemId} className="pf-c-data-list__item" aria-labelledby="check-action-item1">
+      <div className="pf-c-data-list__check">
+        <I18n>
+          {({ i18n }) => (
+            <Checkbox
+              checked={isSelected}
+              onChange={onSelect}
+              aria-label={i18n._(t`selected ${itemId}`)}
+              id={`selectd-${itemId}`}
+              value={itemId}
+            />
+          )}
+        </I18n>
+      </div>
+      <div className="pf-c-data-list__cell">
+        <span id="check-action-item1">
+          <b>{name}</b>
+        </span>
+      </div>
+    </li>
+  );
diff --git a/src/components/ListItem/index.js b/src/components/ListItem/index.js
new file mode 100644
index 0000000000..038fb1ed81
--- /dev/null
+++ b/src/components/ListItem/index.js
@@ -0,0 +1,3 @@
+import ListItem from './ListItem';
+
+export default ListItem;
diff --git a/src/components/Lookup/Lookup.jsx b/src/components/Lookup/Lookup.jsx
index 2857d7420f..3be0464535 100644
--- a/src/components/Lookup/Lookup.jsx
+++ b/src/components/Lookup/Lookup.jsx
@@ -3,15 +3,14 @@ import React from 'react';
 import { SearchIcon } from '@patternfly/react-icons';
 import {
   Modal,
-  List,
-  ListItem,
-  Checkbox,
   Button,
   ActionGroup,
   Toolbar,
   ToolbarGroup,
 } from '@patternfly/react-core';
 
+import ListItem from '../ListItem'
+
 class Lookup extends React.Component {
   constructor(props) {
     super(props);
@@ -54,24 +53,23 @@ class Lookup extends React.Component {
         <span className="pf-c-input-group__text" aria-label="search" id="search" onClick={this.onLookup}><SearchIcon /></span>
         <div className="pf-c-form-control">{this.wrapTags(this.props.data)}</div>
         <Modal
+          isLarge
           className="awx-c-modal"
           title={`Select ${this.props.lookup_header}`}
           isOpen={isModalOpen}
           onClose={this.handleModalToggle}
         >
-          <List>
+          <ul className="pf-c-data-list awx-c-list">
             {data.map(i =>
-              <ListItem key={i.id}>
-                <Checkbox
-                  label={i.name}
-                  checked={i.isChecked}
-                  onChange={this.onChecked}
-                  aria-label="result checkbox"
-                  id={`checked-${i.id}`}
-                  value={i.id}
-                />
-              </ListItem>)}
-          </List>
+              <ListItem
+                key={i.id}
+                itemId={i.id}
+                name={i.name}
+                isSelected={i.isChecked}
+                onSelect={this.onChecked}
+              />
+            )}
+          </ul>
           <ActionGroup className="at-align-right">
             <Toolbar>
               <ToolbarGroup>