diff --git a/src/components/RequestBox/PatientSearchBar/PatientSearchBar.js b/src/components/RequestBox/PatientSearchBar/PatientSearchBar.js
index 250428f4..338b366f 100644
--- a/src/components/RequestBox/PatientSearchBar/PatientSearchBar.js
+++ b/src/components/RequestBox/PatientSearchBar/PatientSearchBar.js
@@ -78,6 +78,8 @@ export default function PatientSearchBar(props) {
                                 key={patient.id}
                                 patient={props.searchablePatients.find(item => item.id === patient.id)}
                                 client={props.client}
+                                request={props.request}
+                                launchUrl={props.launchUrl}
                                 callback={props.callback}
                                 callbackList={props.callbackList}
                                 callbackMap={props.callbackMap}
diff --git a/src/components/RequestBox/RequestBox.js b/src/components/RequestBox/RequestBox.js
index 913b4d3f..53627c31 100644
--- a/src/components/RequestBox/RequestBox.js
+++ b/src/components/RequestBox/RequestBox.js
@@ -158,6 +158,7 @@ export default class RequestBox extends Component {
     if (prefetchMap.size > 0) {
       return this.renderRequestResources(prefetchMap);
     }
+    return <div className="prefetched" />;
   }
 
   renderRequestResources(requestResources) {
@@ -385,12 +386,6 @@ export default class RequestBox extends Component {
                 </div>
               </div>
               <div className="action-btns">
-                {Object.keys(this.props.response).length ?
-                  <InProgressFormBox
-                    qrResponse={this.props.response}
-                    relaunch={this.relaunch}
-                  />
-                : <span />}
                 <ButtonGroup variant="outlined" aria-label="outlined button group">
                   <Button onClick={this.launchSmartOnFhirApp} disabled={disableLaunchSmartOnFhir}>
                     Launch SMART on FHIR App
diff --git a/src/components/SMARTBox/PatientBox.js b/src/components/SMARTBox/PatientBox.js
index ea337028..2e225b07 100644
--- a/src/components/SMARTBox/PatientBox.js
+++ b/src/components/SMARTBox/PatientBox.js
@@ -1,13 +1,17 @@
 import React, { Component } from 'react';
 import { getAge, getDrugCodeFromMedicationRequest } from '../../util/fhir';
 import './smart.css';
-import { Button, IconButton } from '@mui/material';
-import RefreshIcon from '@mui/icons-material/Refresh';
-import Box from '@mui/material/Box';
-import InputLabel from '@mui/material/InputLabel';
-import MenuItem from '@mui/material/MenuItem';
-import FormControl from '@mui/material/FormControl';
-import Select from '@mui/material/Select';
+import { Button } from '@mui/material';
+import Tooltip from '@mui/material/Tooltip';
+import MedicationIcon from '@mui/icons-material/Medication';
+import Paper from '@mui/material/Paper';
+import Table from '@mui/material/Table';
+import TableBody from '@mui/material/TableBody';
+import TableCell from '@mui/material/TableCell';
+import TableContainer from '@mui/material/TableContainer';
+import TableHead from '@mui/material/TableHead';
+import TableRow from '@mui/material/TableRow';
+import { retrieveLaunchContext } from '../../util/util';
 
 export default class PatientBox extends Component {
   constructor(props) {
@@ -22,7 +26,10 @@ export default class PatientBox extends Component {
       questionnaireResponses: {},
       openRequests: false,
       openQuestionnaires: false,
-      questionnaireTitles: {}
+      questionnaireTitles: {},
+      showMedications: false,
+      showQuestionnaires: false,
+      numInProgressForms: 0,
     };
 
     this.handleRequestChange = this.handleRequestChange.bind(this);
@@ -37,7 +44,6 @@ export default class PatientBox extends Component {
     this.getQuestionnaireTitles = this.getQuestionnaireTitles.bind(this);
     this.makeQROption = this.makeQROption.bind(this);
     this.handleResponseChange = this.handleResponseChange.bind(this);
-    this.makeDropdown = this.makeDropdown.bind(this);
   }
 
   componentDidMount() {
@@ -80,30 +86,6 @@ export default class PatientBox extends Component {
     return code;
   }
 
-  makeDropdown(options, label, stateVar, stateChange) {
-    return (
-      <Box sx={{ minWidth: 120 }}>
-        <FormControl fullWidth>
-          <InputLabel>{label}</InputLabel>
-          <Select
-            labelId={`${label}-label`}
-            value={stateVar}
-            label={label}
-            data-testid="dropdown-box"
-            onChange={stateChange}
-          >
-            {options.map(op => {
-              return (
-                <MenuItem key={op.key} value={op.value}>
-                  {op.text}
-                </MenuItem>
-              );
-            })}
-          </Select>
-        </FormControl>
-      </Box>
-    );
-  }
 
   makeOption(request, options) {
     const code = this.getCoding(request);
@@ -111,6 +93,8 @@ export default class PatientBox extends Component {
     let option = {
       key: request.id,
       text: code.display + ' (Medication request: ' + code.code + ')',
+      code: code.code,
+      name: code.display,
       value: JSON.stringify(request)
     };
     options.push(option);
@@ -142,16 +126,19 @@ export default class PatientBox extends Component {
 
     if (this.state.response) {
       const response = JSON.parse(this.state.response);
-      this.updateQRResponse(patient, response);
+      this.updateQRResponse(response);
     }
   }
 
-  updateQRResponse(patient, response) {
+  updatePatient(patient) {
+    this.props.callback('patient', patient);
+  }
+
+  updateQRResponse(response) {
     this.props.callback('response', response);
   }
 
   fetchResources(queries) {
-    console.log(queries);
     var requests = [];
     this.props.callback('prefetchCompleted', false);
     queries.forEach((query, queryKey) => {
@@ -295,8 +282,7 @@ export default class PatientBox extends Component {
       });
   }
 
-  handleRequestChange(e) {
-    const data = e.target.value;
+  handleRequestChange(data, patient) {
     if (data) {
       let coding = this.getCoding(JSON.parse(data));
       this.setState({
@@ -306,6 +292,21 @@ export default class PatientBox extends Component {
         display: coding.display,
         response: ''
       });
+      this.props.callback('response', '');
+      // update prefetch request for the medication
+      const request = JSON.parse(data);
+      if (
+        request.resourceType === 'DeviceRequest' ||
+        request.resourceType === 'ServiceRequest' ||
+        request.resourceType === 'MedicationRequest' ||
+        request.resourceType === 'MedicationDispense'
+      ) {
+        this.updatePrefetchRequest(request, patient, this.props.defaultUser);
+      } else {
+        this.props.clearCallback();
+      }
+      // close the accordian after selecting a medication, can change if we want to keep open
+      this.props.callback('expanded', false);
     } else {
       this.setState({
         request: ''
@@ -313,12 +314,13 @@ export default class PatientBox extends Component {
     }
   }
 
-  handleResponseChange(e) {
-    const data = e.target.value;
+  handleResponseChange(data) {
     if (data) {
       this.setState({
         response: data
       });
+      const response = JSON.parse(data);
+      this.updateQRResponse(response);
     } else {
       this.setState({
         response: ''
@@ -356,6 +358,7 @@ export default class PatientBox extends Component {
       })
       .then(result => {
         this.setState({ questionnaireResponses: result });
+        this.setState({ numInProgressForms: result.data.length });
       })
       .then(() => this.getQuestionnaireTitles());
   }
@@ -382,46 +385,192 @@ export default class PatientBox extends Component {
 
   makeQROption(qr) {
     const questionnaireTitle = this.state.questionnaireTitles[qr.questionnaire];
-    const display = `${questionnaireTitle}: created at ${qr.authored}`;
+    // const display = `${questionnaireTitle}: created at ${qr.authored}`;
     return {
       key: qr.id,
-      text: display,
+      text: questionnaireTitle,
+      time: qr.authored,
       value: JSON.stringify(qr)
     };
   }
 
+  isOrderNotSelected() {
+    return Object.keys(this.props.request).length === 0;
+  }
+
+  /**
+   * Launch In progress From
+  */
+
+  relaunch = (data) => {
+    this.handleResponseChange(data);
+    this.props.callback('expanded', false);
+    this.buildLaunchLink(data).then(link => {
+      //e.preventDefault();
+      window.open(link.url, '_blank');
+    });
+  };
+
+  async buildLaunchLink(data) {
+    // build appContext and URL encode it
+    let appContext = '';
+    let order = undefined,
+      coverage = undefined,
+      response = undefined;
+
+    if (!this.isOrderNotSelected()) {
+      if (Object.keys(this.props.request).length > 0) {
+        order = `${this.props.request.resourceType}/${this.props.request.id}`;
+        if (this.props.request.insurance && this.props.request.insurance.length > 0) {
+          coverage = `${this.props.request.insurance[0].reference}`;
+        }
+      }
+    }
+
+    if (order) {
+      appContext += `order=${order}`;
+
+      if (coverage) {
+        appContext += `&coverage=${coverage}`;
+      }
+    }
+
+    // using data passed in instead of waiting for state/props variables to be updated
+    const resp = JSON.parse(data);
+    if (Object.keys(resp).length > 0) {
+      response = `QuestionnaireResponse/${resp.id}`;
+    }
+
+    if (order && response) {
+      appContext += `&response=${response}`;
+    } else if (!order && response) {
+      appContext += `response=${response}`;
+    }
+
+    const link = {
+      appContext: encodeURIComponent(appContext),
+      type: 'smart',
+      url: this.props.launchUrl
+    };
+
+    let linkCopy = Object.assign({}, link);
+
+    const result = await retrieveLaunchContext(linkCopy, this.props.patient.id, this.props.client.state);
+    linkCopy = result;
+    return linkCopy;
+  }
+
+  makeResponseTable(columns, options, type, patient) {
+    return (
+      <TableContainer key={type} component={Paper} sx={{ blackgroundColor: '#ddd', border: '1px solid #535353' }}>
+        <Table sx={{ maxHeight: 440, justifyContent: 'center' }} stickyHeader>
+          <TableHead sx={{ borderBottom: '1px solid #535353'}}>
+            <TableRow>
+              {columns.map((column) => (
+                <TableCell
+                  key={column.id}
+                  align={column.align}
+                  style={{ border: 0 }}
+                >
+                  {column.label}
+                </TableCell>
+              ))}
+            </TableRow>
+          </TableHead>
+          <TableBody>
+            {options.map((row) => (
+              <Tooltip title='Select Medication' arrow>
+                <TableRow
+                  key={row.key}
+                  sx={{ 'td, th': { border: 0 } }}
+                  className='hover-row'
+                  onClick={() => this.handleRequestChange(row.value, patient)}
+                >
+                  <TableCell component="th" scope="row">
+                    {row.name}
+                  </TableCell>
+                  <TableCell>{row.code}</TableCell>
+                </TableRow>
+              </Tooltip>
+            ))}
+          </TableBody>
+        </Table>
+      </TableContainer>
+    );
+  }
+
+  makeQuestionnaireTable(columns, options, type, patient) {
+    return (
+      <TableContainer key={type} component={Paper} sx={{ blackgroundColor: '#ddd', border: '1px solid #535353' }}>
+        <Table sx={{ maxHeight: 440, justifyContent: 'center' }} stickyHeader>
+          <TableHead sx={{ borderBottom: '1px solid #535353'}}>
+            <TableRow>
+              {columns.map((column) => (
+                <TableCell
+                  key={column.id}
+                  align={column.align}
+                  style={{ border: 0 }}
+                >
+                  {column.label}
+                </TableCell>
+              ))}
+            </TableRow>
+          </TableHead>
+          <TableBody>
+            {options.map((row) => (
+              <Tooltip title='Open In-Progress Form' arrow>
+                <TableRow
+                  key={row.key}
+                  sx={{ 'td, th': { border: 0 } }}
+                  onClick={() => this.relaunch(row.value)}
+                  className='hover-row'
+                >
+                  <TableCell component="th" scope="row">
+                    {row.text}
+                  </TableCell>
+                  <TableCell>{row.time}</TableCell>
+                </TableRow>
+              </Tooltip>
+            ))}
+          </TableBody>
+        </Table>
+      </TableContainer>
+    );
+  }
+
   render() {
     const patient = this.props.patient;
     let name = '';
+    let fullName = '';
+    let formatBirthdate = '';
     if (patient.name) {
       name = <span> {`${patient.name[0].given[0]} ${patient.name[0].family}`} </span>;
+      fullName = <span> {`${patient.name[0].given.join(' ')} ${patient.name[0].family}`} </span>;
+    }
+    if (patient.birthDate) {
+      formatBirthdate = new Date(patient.birthDate).toDateString();
     }
 
     // add all of the requests to the list of options
     let options = [];
     let responseOptions = [];
-    let returned = false;
     if (this.state.deviceRequests.data) {
-      returned = true;
       this.state.deviceRequests.data.forEach(e => {
         this.makeOption(e, options);
       });
     }
     if (this.state.serviceRequests.data) {
-      returned = true;
       this.state.serviceRequests.data.forEach(e => {
         this.makeOption(e, options);
       });
     }
     if (this.state.medicationRequests.data) {
-      returned = true;
       this.state.medicationRequests.data.forEach(e => {
         this.makeOption(e, options);
       });
     }
 
     if (this.state.medicationDispenses.data) {
-      returned = true;
       this.state.medicationDispenses.data.forEach(e => {
         this.makeOption(e, options);
       });
@@ -429,13 +578,20 @@ export default class PatientBox extends Component {
 
     if (this.state.questionnaireResponses.data) {
       responseOptions = this.state.questionnaireResponses.data.map(qr => this.makeQROption(qr));
-      returned = true;
     }
 
-    let noResults = 'No results found.';
-    if (!returned) {
-      noResults = 'Loading...';
-    }
+    const medicationColumns = [
+      { id: 'name', label: 'Medication'},
+      { id: 'code', label: 'Request #'},
+    ];
+
+    const questionnaireColumns = [
+      { id: 'name', label: 'Title'},
+      { id: 'time', label: 'Created'}
+    ];
+
+    const medicationTooltip = options.length === 0 ? 'No medications found.' : `${options.length} medications available`;
+    const formTooltip = this.state.numInProgressForms === 0 ? 'No In-Progress Forms' : 'Open In-Progress Forms';
 
     return (
       <div key={patient.id} className="patient-box">
@@ -446,56 +602,57 @@ export default class PatientBox extends Component {
         <div className="patient-selection-box">
           <div className="patient-info">
             <div>
-              <span style={{ fontWeight: 'bold' }}>Gender</span>: {patient.gender}
+              <span style={{ fontWeight: 'bold' }}>Full Name</span>: {fullName}
             </div>
             <div>
-              <span style={{ fontWeight: 'bold' }}>Age</span>: {getAge(patient.birthDate)}
+              <span style={{ fontWeight: 'bold' }}>Gender</span>: {patient.gender.charAt(0).toUpperCase() + patient.gender.slice(1)}
+            </div>
+            <div>
+              <span style={{ fontWeight: 'bold' }}>DoB/Age</span>: {formatBirthdate} ({getAge(patient.birthDate)} years old)
             </div>
           </div>
-          <div className="request-info">
-            <span style={{ fontWeight: 'bold', marginRight: '5px', padding: '5px' }}>Request:</span>
-            {!options.length && returned ? (
-              <span className="emptyForm">No requests</span>
-            ) : (
-              this.makeDropdown(
-                options,
-                'Select a medication request',
-                this.state.request,
-                this.handleRequestChange
-              )
-            )}
-          </div>
-          <div className="request-info">
-            <span style={{ fontWeight: 'bold', marginRight: '5px', padding: '5px' }}>
-              In Progress Form:
-              <IconButton
-                color="primary"
-                style={{ padding: '0px 5px' }}
-                onClick={this.getResponses}
-              >
-                <RefreshIcon />
-              </IconButton>
+          <div className="button-options">
+          { this.state.showMedications ? 
+            <Button variant='contained' className='big-button' startIcon={<MedicationIcon />} onClick={() => this.setState({ showMedications: false })}>Close Medications</Button>
+          : <Tooltip title={medicationTooltip} placement="top">
+            <span>
+              <Button variant='contained' className='big-button' startIcon={<MedicationIcon />} disabled={options.length === 0} onClick={() => {
+                this.updatePatient(patient);
+                this.setState({ showMedications: true, showQuestionnaires: false });
+              }}>Request New Medication</Button>
             </span>
-            {!responseOptions.length && returned ? (
-              <span className="emptyForm">No in progress forms</span>
-            ) : (
-              this.makeDropdown(
-                responseOptions,
-                'Choose an in-progress form',
-                this.state.response,
-                this.handleResponseChange
-              )
-            )}
-          </div>
+            </Tooltip>}
+          { this.state.showQuestionnaires ? 
+            <Button variant='contained' className='big-button' startIcon={<MedicationIcon />} onClick={() => this.setState({ showQuestionnaires: false })}>Close In Progress Forms</Button>
+          :
+          <Tooltip title={formTooltip} placement="top">
+            <span>
+              <Button variant='contained' className='big-button' startIcon={<MedicationIcon />} disabled={this.state.numInProgressForms === 0} onClick={() => {
+              this.updatePatient(patient);
+              this.setState({ showQuestionnaires: true, showMedications: false });
+            }}>{this.state.numInProgressForms} Form(s) In Progress</Button> 
+            </span>
+          </Tooltip> 
+          }
           <Button
-            variant="outlined"
-            size="small"
-            className="select-btn"
+            variant="contained"
+            className='select-btn'
             onClick={() => this.updateValues(patient)}
           >
-            Select
+            Select Patient
           </Button>
+          </div>
         </div>
+        { this.state.showMedications ?
+          <div className='patient-table-info'>
+            { this.makeResponseTable(medicationColumns, options, 'medication', patient) }
+          </div>
+        : <span />}
+        { this.state.showQuestionnaires ?
+          <div className='patient-table-info'>
+            { this.makeQuestionnaireTable(questionnaireColumns, responseOptions, 'questionnaire', patient) }
+          </div>
+        : <span />}
       </div>
     );
   }
diff --git a/src/components/SMARTBox/smart.css b/src/components/SMARTBox/smart.css
index 243de77e..f95cd6dd 100644
--- a/src/components/SMARTBox/smart.css
+++ b/src/components/SMARTBox/smart.css
@@ -11,9 +11,28 @@ html{
     padding:10px 10px 15px 10px;
     flex:1;
     background-color: #ddd;
-    display: grid;
-    grid-template-columns: 15% 35% 35% 10%;
-    column-gap: 5px;
+    display: flex;
+    justify-content: space-between;
+}
+.button-options {
+    display: flex;
+    column-gap: 12px;
+}
+
+.patient-table-info {
+    /* display: flex; */
+    margin-bottom: 10px;
+}
+tr:nth-child(odd) { 
+    background-color: #ddd !important; 
+} 
+.hover-row:hover {
+    background-color: #E7F1FF !important;
+}
+
+.big-button {
+    display: flex !important;
+    flex-direction: column !important;
 }
 
 .patient-box{
@@ -63,12 +82,9 @@ html{
     float:right;
 }
 
-.patient-info {
-    display:inline-block;
-}
-
 .request-info {
-    display: inherit;
+    display: flex;
+    flex-direction: column;
 
 }
 
@@ -84,9 +100,7 @@ html{
 }
 
 .select-btn {
-    height: 40px;
-    align-self: center;
-    margin-top: 25px !important;
+    height: 52px;
 }
 
 .emptyForm {
diff --git a/src/containers/RequestBuilder.js b/src/containers/RequestBuilder.js
index eba3a64c..a75d266c 100644
--- a/src/containers/RequestBuilder.js
+++ b/src/containers/RequestBuilder.js
@@ -28,7 +28,7 @@ export default class RequestBuilder extends Component {
       patient: {}, 
       expanded: false,
       patientList: [],
-      response: null,
+      response: {},
       code: null,
       codeSystem: null,
       display: null,
@@ -298,6 +298,8 @@ export default class RequestBuilder extends Component {
                       getPatients = {this.getPatients}
                       searchablePatients={this.state.patientList}
                       client={this.props.client}
+                      request={this.state.request}
+                      launchUrl={this.state.launchUrl}
                       callback={this.updateStateElement}
                       callbackList={this.updateStateList}
                       callbackMap={this.updateStateMap}