diff --git a/api/Services/migrations/lib/mysql-import.js b/api/Services/migrations/lib/mysql-import.js
index fe3cc067..8bf39268 100644
--- a/api/Services/migrations/lib/mysql-import.js
+++ b/api/Services/migrations/lib/mysql-import.js
@@ -61,7 +61,7 @@ class Importer {
 	 * @returns {undefined}
 	 */
 	setEncoding(encoding) {
-		var supported_encodings = [
+		const supported_encodings = [
 			'utf8',
 			'ucs2',
 			'utf16le',
@@ -106,8 +106,8 @@ class Importer {
 		return new Promise(async (resolve, reject) => {
 			try {
 				await this._connect();
-				var files = await this._getSQLFilePaths(...input);
-				var error = null;
+				const files = await this._getSQLFilePaths(...input);
+				const error = null;
 				await slowLoop(files, (file, index, next) => {
 					if (error) {
 						next();
@@ -163,8 +163,8 @@ class Importer {
 					reject(err);
 					return;
 				}
-				var queries = new queryParser(queriesString).queries;
-				var error = null;
+				const queries = new queryParser(queriesString).queries;
+				const error = null;
 				slowLoop(queries, (query, index, next) => {
 					if (error) {
 						next();
@@ -260,8 +260,8 @@ class Importer {
 	 */
 	_getSQLFilePaths(...paths) {
 		return new Promise(async (resolve, reject) => {
-			var full_paths = [];
-			var error = null;
+			const full_paths = [];
+			const error = null;
 			paths = [].concat.apply([], paths); // flatten array of paths
 			await slowLoop(paths, async (filepath, index, next) => {
 				if (error) {
@@ -270,16 +270,16 @@ class Importer {
 				}
 				try {
 					await this._fileExists(filepath);
-					var stat = await this._statFile(filepath);
+					const stat = await this._statFile(filepath);
 					if (stat.isFile()) {
 						if (filepath.toLowerCase().substring(filepath.length - 4) === '.sql') {
 							full_paths.push(path.resolve(filepath));
 						}
 						next();
 					} else if (stat.isDirectory()) {
-						var more_paths = await this._readDir(filepath);
+						const more_paths = await this._readDir(filepath);
 						more_paths = more_paths.map(p => path.join(filepath, p));
-						var sql_files = await this._getSQLFilePaths(...more_paths);
+						const sql_files = await this._getSQLFilePaths(...more_paths);
 						full_paths.push(...sql_files);
 						next();
 					} else {
@@ -394,12 +394,12 @@ class queryParser {
 
 	// Check to see if a new delimiter is being assigned
 	checkNewDelimiter(char) {
-		var buffer_str = this.buffer.join('').toLowerCase().trim();
+		const buffer_str = this.buffer.join('').toLowerCase().trim();
 		if (buffer_str === 'delimiter' && !this.quoteType) {
 			this.seekingDelimiter = true;
 			this.buffer = [];
 		} else {
-			var isNewLine = char === "\n" || char === "\r";
+			const isNewLine = char === "\n" || char === "\r";
 			if (isNewLine && this.seekingDelimiter) {
 				this.seekingDelimiter = false;
 				this.delimiter = this.buffer.join('').trim();
@@ -410,7 +410,7 @@ class queryParser {
 
 	// Check if the current char is a quote
 	checkQuote(char) {
-		var isQuote = (char === '"' || char === "'") && !this.escaped;
+		const isQuote = (char === '"' || char === "'") && !this.escaped;
 		if (isQuote && this.quoteType === char) {
 			this.quoteType = false;
 		} else if (isQuote && !this.quoteType) {
@@ -420,7 +420,7 @@ class queryParser {
 
 	// Check if we're at the end of the query
 	checkEndOfQuery() {
-		var demiliterFound = false;
+		const demiliterFound = false;
 		if (!this.quoteType && this.buffer.length >= this.delimiter.length) {
 			demiliterFound = this.buffer.slice(-this.delimiter.length).join('') === this.delimiter;
 		}
diff --git a/api/Services/poamMilestoneService.js b/api/Services/poamMilestoneService.js
index 6046f2ed..dc7c3706 100644
--- a/api/Services/poamMilestoneService.js
+++ b/api/Services/poamMilestoneService.js
@@ -188,7 +188,7 @@ exports.deletePoamMilestone = async function deletePoamMilestone(poamId, milesto
             let sql = "DELETE FROM cpat.poammilestones WHERE poamId= ? AND milestoneId = ?";
             await connection.query(sql, [poamId, milestoneId]);
 
-            const action = `Milestone Deleted.`;
+            let action = `Milestone Deleted.`;
             if (requestBody.requestorId) {
                 if (requestBody.extension == true) {
                     action = `Extension milestone deleted.`;
diff --git a/client/src/app/Shared/notifications/notifications-popover/notifications-popover.component.html b/client/src/app/Shared/notifications/notifications-popover/notifications-popover.component.html
index e70252d9..4d111613 100644
--- a/client/src/app/Shared/notifications/notifications-popover/notifications-popover.component.html
+++ b/client/src/app/Shared/notifications/notifications-popover/notifications-popover.component.html
@@ -19,7 +19,7 @@
                 <i [class]="notification.icon"></i>
               </div>
               <h4>{{ notification.title }}</h4>
-              <i *ngIf="notification.notificationId" class="dismiss-icon pi pi-times" (click)="dismissNotification(notification)"></i>
+              <i *ngIf="notification.notificationId" class="dismiss-icon pi pi-times" (click)="dismissNotification(notification)" (onKeyUp)="dismissNotification(notification)"></i>
             </div>
             <p>{{ notification.message }}</p>
             <small>{{ notification.timestamp | date:'short' }}</small>
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 45dcf401..b5b99629 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -24,7 +24,7 @@ const routes: Routes = [
   { path: 'poam-processing', canActivate: [AuthGuard], loadChildren: () => import('./pages/poam-processing/poam-processing.module').then(m => m.PoamProcessingModule) },
   { path: 'marketplace', canActivate: [AuthGuard], loadChildren: () => import('./pages/marketplace/marketplace.module').then(m => m.MarketplaceModule) },
   { path: 'unauthorized', component: UnauthorizedComponent },
-  { path: '' || '**', redirectTo: 'consent' },
+  { path: '**', redirectTo: 'consent' },
 ];
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 5a135083..0ca56940 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -12,7 +12,7 @@
   <app-config></app-config>
   <div class="layout-topbar">
     <div class="layout-topbar-left">
-      <img src="../assets/cpat.png" alt="C-PAT" (click)="reloadPage()" (keyup.enter)="reloadPage()" style="cursor: pointer;">
+      <img src="../assets/cpat.png" alt="C-PAT" (click)="reloadPage()" (onKeyUp)="reloadPage()" style="cursor: pointer;">
     </div>
     <div class="layout-topbar-right">
       <button pButton type="button" icon="pi pi-palette text-2xl" class="p-button-text p-button-rounded p-button-plain" (click)="showConfig()"></button>
@@ -20,6 +20,7 @@
                 icon="pi pi-bell text-2xl"
                 [badge]="notificationCount"
                 (click)="op.toggle($event)"
+                (onKeyUp)="op.toggle($event)"
                 styleClass="p-button-text p-button-rounded p-button-plain notification-button">
       </p-button>
       <p-overlayPanel #op class="overlay" [dismissable]="true" [showCloseIcon]="false">
diff --git a/client/src/app/pages/admin-processing/admin-processing.component.html b/client/src/app/pages/admin-processing/admin-processing.component.html
index 64d56f11..05f93d11 100644
--- a/client/src/app/pages/admin-processing/admin-processing.component.html
+++ b/client/src/app/pages/admin-processing/admin-processing.component.html
@@ -3,7 +3,8 @@
     <p-status-card [title]="statusCard.title"
                    [type]="statusCard.type"
                    [icon]="statusCard.icon"
-                   (click)="statusCard.component ? openModal(statusCard.component) : triggerFileInput()">
+                   (click)="statusCard.component ? openModal(statusCard.component) : triggerFileInput()"
+                   (onKeyUp)="statusCard.component ? openModal(statusCard.component) : triggerFileInput()">
     </p-status-card>
   </div>
 </div>
diff --git a/client/src/app/pages/admin-processing/collection-processing/collection-processing.component.html b/client/src/app/pages/admin-processing/collection-processing/collection-processing.component.html
index 36aeb26d..43061c52 100644
--- a/client/src/app/pages/admin-processing/collection-processing/collection-processing.component.html
+++ b/client/src/app/pages/admin-processing/collection-processing/collection-processing.component.html
@@ -22,7 +22,7 @@
           </ng-template>
           <ng-template pTemplate="header" let-columns>
             <tr>
-              <th id="col" *ngFor="let col of columns">
+              <th scope="col" *ngFor="let col of columns">
                 {{col}}
               </th>
             </tr>
diff --git a/client/src/app/pages/admin-processing/collection-processing/collection/collection.component.html b/client/src/app/pages/admin-processing/collection-processing/collection/collection.component.html
index 53d5995b..273ab71e 100644
--- a/client/src/app/pages/admin-processing/collection-processing/collection/collection.component.html
+++ b/client/src/app/pages/admin-processing/collection-processing/collection/collection.component.html
@@ -59,7 +59,7 @@
   </div>
   <!-- Buttons -->
   <div class="buttons">
-    <p-button label="Submit" styleClass="p-button-primary p-button-outlined" [disabled]="!form.valid" (click)="onSubmit()"></p-button>
-    <p-button label="Cancel" styleClass="p-button-primary p-button-outlined" (click)="resetData()" [style]="{'margin-left':'20px'}"></p-button>
+    <p-button label="Submit" styleClass="p-button-primary p-button-outlined" [disabled]="!form.valid" (click)="onSubmit()" (onKeyUp)="onSubmit()"></p-button>
+    <p-button label="Cancel" styleClass="p-button-primary p-button-outlined" (click)="resetData()" (onKeyUp)="resetData()" [style]="{'margin-left':'20px'}"></p-button>
   </div>
 </form>
diff --git a/client/src/app/pages/admin-processing/stigmanager-admin/stigmanager-admin.component.html b/client/src/app/pages/admin-processing/stigmanager-admin/stigmanager-admin.component.html
index d7e76cb3..d15e1286 100644
--- a/client/src/app/pages/admin-processing/stigmanager-admin/stigmanager-admin.component.html
+++ b/client/src/app/pages/admin-processing/stigmanager-admin/stigmanager-admin.component.html
@@ -28,6 +28,7 @@
               class="import-button"
               styleClass="p-button-info"
               (click)="importSTIGManagerCollection()"
+              (onKeyUp)="importSTIGManagerCollection()"
               pTooltip="If a STIG Manager collection has previously been imported, importing again will update the collection and relative assets with current data from STIG Manager."
               tooltipPosition="left"
               [style]="{'width':'100%'}"
diff --git a/client/src/app/pages/admin-processing/user-processing/user-processing.component.html b/client/src/app/pages/admin-processing/user-processing/user-processing.component.html
index 2f6412e3..4d870643 100644
--- a/client/src/app/pages/admin-processing/user-processing/user-processing.component.html
+++ b/client/src/app/pages/admin-processing/user-processing/user-processing.component.html
@@ -22,7 +22,7 @@
           </ng-template>
           <ng-template pTemplate="header" let-columns>
             <tr>
-              <th id="col" *ngFor="let col of columns">
+              <th scope="col" *ngFor="let col of columns">
                 {{col}}
               </th>
             </tr>
@@ -42,7 +42,7 @@
                   <p-table [value]="rowNode.children" [columns]="['Collection', 'Access Level']" [responsive]="true">
                     <ng-template pTemplate="header" let-columns>
                       <tr>
-                        <th id="col" *ngFor="let col of columns">
+                        <th scope="col" *ngFor="let col of columns">
                           {{col}}
                         </th>
                       </tr>
diff --git a/client/src/app/pages/admin-processing/user-processing/user/user.component.html b/client/src/app/pages/admin-processing/user-processing/user/user.component.html
index 501a3a89..435a928f 100644
--- a/client/src/app/pages/admin-processing/user-processing/user/user.component.html
+++ b/client/src/app/pages/admin-processing/user-processing/user/user.component.html
@@ -86,10 +86,10 @@
       <p-table [value]="collectionPermissions" [columns]="cols" editMode="row">
         <ng-template pTemplate="header" let-columns>
           <tr>
-            <th>
+            <th scope="col">
               <button pButton icon="pi pi-plus" class="p-button-text" (click)="onAddNewPermission()"></button>
             </th>
-            <th id="col" *ngFor="let col of columns">
+            <th scope="col" *ngFor="let col of columns">
               {{col.header}}
             </th>
           </tr>
diff --git a/client/src/app/pages/asset-processing/asset-processing.component.html b/client/src/app/pages/asset-processing/asset-processing.component.html
index 546e0573..6ca0e8da 100644
--- a/client/src/app/pages/asset-processing/asset-processing.component.html
+++ b/client/src/app/pages/asset-processing/asset-processing.component.html
@@ -19,7 +19,7 @@
                 <i class="pi pi-search"></i>
                 <input pInputText id="search" [(ngModel)]="filterValue" (input)="applyFilter($event)" placeholder="Search Assets" style="width: 300px;">
               </span>
-              <p-button label="Clear" [outlined]="true" severity="info" class="ml-auto" icon="pi pi-filter-slash" (click)="clear()"></p-button>
+              <p-button label="Clear" [outlined]="true" severity="info" class="ml-auto" icon="pi pi-filter-slash" (click)="clear()" (onKeyUp)="clear()"></p-button>
             </div>
             <div class="scrollable-assets">
               <p-table #assetTable
@@ -31,31 +31,31 @@
                        [globalFilterFields]="['assetId', 'assetName', 'description', 'ipAddress', 'macAddress']">
                 <ng-template pTemplate="header">
                   <tr>
-                    <th style="min-width:5rem">
+                    <th scope="col" style="min-width:5rem">
                       <div class="flex align-items-center">
                         Asset ID
                         <p-columnFilter type="text" field="assetId" display="menu" />
                       </div>
                     </th>
-                    <th style="min-width:15rem">
+                    <th scope="col" style="min-width:15rem">
                       <div class="flex align-items-center">
                         Asset Name
                         <p-columnFilter type="text" field="assetName" display="menu" />
                       </div>
                     </th>
-                    <th style="min-width:15rem">
+                    <th scope="col" style="min-width:15rem">
                       <div class="flex align-items-center">
                         Description
                         <p-columnFilter type="text" field="description" display="menu" />
                       </div>
                     </th>
-                    <th style="min-width:15rem">
+                    <th scope="col" style="min-width:15rem">
                       <div class="flex align-items-center">
                         IP Address
                         <p-columnFilter type="text" field="ipAddress" display="menu" />
                       </div>
                     </th>
-                    <th style="min-width:15rem">
+                    <th scope="col" style="min-width:15rem">
                       <div class="flex align-items-center">
                         MAC Address
                         <p-columnFilter type="text" field="macAddress" display="menu" />
@@ -64,7 +64,7 @@
                   </tr>
                 </ng-template>
                 <ng-template pTemplate="body" let-asset let-rowIndex="rowIndex">
-                  <tr [pSelectableRow]="asset" [pSelectableRowIndex]="rowIndex" (click)="setAsset(asset.assetId)">
+                  <tr [pSelectableRow]="asset" [pSelectableRowIndex]="rowIndex" (click)="setAsset(asset.assetId)" (onKeyUp)="setAsset(asset.assetId)">
                     <td>{{asset.assetId}}</td>
                     <td>{{asset.assetName}}</td>
                     <td>{{asset.description}}</td>
diff --git a/client/src/app/pages/asset-processing/asset/asset.component.html b/client/src/app/pages/asset-processing/asset/asset.component.html
index dc856720..df9035d3 100644
--- a/client/src/app/pages/asset-processing/asset/asset.component.html
+++ b/client/src/app/pages/asset-processing/asset/asset.component.html
@@ -56,10 +56,10 @@
         <p-table [value]="assetLabels" dataKey="labelId">
           <ng-template pTemplate="header">
             <tr>
-              <th style="width:8rem">
+              <th scope="col" style="width:8rem">
                 <button pButton pRipple type="button" icon="pi pi-plus" (click)="addNewRow()" class="p-button-rounded p-button-text"></button>
               </th>
-              <th>Label</th>
+              <th scope="col">Label</th>
             </tr>
           </ng-template>
           <ng-template pTemplate="body" let-label let-ri="rowIndex">
@@ -105,6 +105,6 @@
 <p-dialog header="Invalid Data" [(visible)]="displayInvalidDataDialog" [modal]="true" [style]="{width: '300px'}" [baseZIndex]="10000">
   <p>{{invalidDataMessage}}</p>
   <ng-template pTemplate="footer">
-    <p-button icon="pi pi-check" (click)="displayInvalidDataDialog=false" label="OK" styleClass="p-button-full p-button-info w-full"></p-button>
+    <p-button icon="pi pi-check" (click)="displayInvalidDataDialog=false" (onKeyUp)="displayInvalidDataDialog=false" label="OK" styleClass="p-button-full p-button-info w-full"></p-button>
   </ng-template>
 </p-dialog>
diff --git a/client/src/app/pages/import-processing/stigmanager-import/stigmanager-import.component.html b/client/src/app/pages/import-processing/stigmanager-import/stigmanager-import.component.html
index 415b7857..fc6759e6 100644
--- a/client/src/app/pages/import-processing/stigmanager-import/stigmanager-import.component.html
+++ b/client/src/app/pages/import-processing/stigmanager-import/stigmanager-import.component.html
@@ -9,7 +9,7 @@
               <p-treeTable #stigFindingsTable sortMode="multiple" [value]="dataSource" [filterDelay]="0" [globalFilterFields]="['Group ID', 'Rule Title', 'Benchmark ID', 'Severity']" [columns]="allColumns" [sortMode]="'single'" [sortField]="sortColumn" [sortOrder]="sortDirection === 'asc' ? 1 : -1" (onSort)="updateSort($event)">
                 <ng-template pTemplate="header">
                   <tr>
-                    <th id="col" *ngFor="let col of allColumns" [ttSortableColumn]="col">
+                    <th scope="col" *ngFor="let col of allColumns" [ttSortableColumn]="col">
                       {{col}}
                       <p-treeTableSortIcon [field]="col" *ngIf="col !== 'Update POAM'"></p-treeTableSortIcon>
                     </th>
diff --git a/client/src/app/pages/label-processing/label-processing.component.html b/client/src/app/pages/label-processing/label-processing.component.html
index bd13d038..2e8c16ea 100644
--- a/client/src/app/pages/label-processing/label-processing.component.html
+++ b/client/src/app/pages/label-processing/label-processing.component.html
@@ -17,7 +17,7 @@
             <i class="pi pi-search"></i>
             <input pInputText id="search" [(ngModel)]="filterValue" (input)="applyFilter($event)" placeholder="Search Labels" style="width: 300px;">
           </span>
-          <p-button label="Clear" [outlined]="true" severity="info" class="ml-auto" icon="pi pi-filter-slash" (click)="clear()"></p-button>
+          <p-button label="Clear" [outlined]="true" severity="info" class="ml-auto" icon="pi pi-filter-slash" (click)="clear()" (onKeyUp)="clear()"></p-button>
         </div>
         <div class="scrollable-labels">
           <p-table #labelTable
@@ -29,19 +29,19 @@
                    [globalFilterFields]="['labelId', 'labelName', 'description']">
             <ng-template pTemplate="header">
               <tr>
-                <th style="min-width:5rem">
+                <th scope="col" style="min-width:5rem">
                   <div class="flex align-items-center">
                     Label ID
                     <p-columnFilter type="text" field="labelId" display="menu" />
                   </div>
                 </th>
-                <th style="min-width:15rem">
+                <th scope="col" style="min-width:15rem">
                   <div class="flex align-items-center">
                     Name
                     <p-columnFilter type="text" field="labelName" display="menu" />
                   </div>
                 </th>
-                <th style="min-width:15rem">
+                <th scope="col" style="min-width:15rem">
                   <div class="flex align-items-center">
                     Description
                     <p-columnFilter type="text" field="description" display="menu" />
@@ -50,7 +50,7 @@
               </tr>
             </ng-template>
             <ng-template pTemplate="body" let-label let-rowIndex="rowIndex">
-              <tr [pSelectableRow]="label" [pSelectableRowIndex]="rowIndex" (click)="setLabel(label.labelId)">
+              <tr [pSelectableRow]="label" [pSelectableRowIndex]="rowIndex" (click)="setLabel(label.labelId)" (onKeyUp)="setLabel(label.labelId)">
                 <td>{{label.labelId}}</td>
                 <td>{{label.labelName}}</td>
                 <td>{{label.description}}</td>
diff --git a/client/src/app/pages/marketplace/marketplace.component.html b/client/src/app/pages/marketplace/marketplace.component.html
index d59aac4d..ee53f647 100644
--- a/client/src/app/pages/marketplace/marketplace.component.html
+++ b/client/src/app/pages/marketplace/marketplace.component.html
@@ -24,7 +24,7 @@
         <div class="theme-card" *ngFor="let theme of themes">
           <p-card [header]="theme.themeName">
             <ng-template pTemplate="header">
-              <img [src]="themeImageUrls[theme.themeId]" [alt]="theme.themeName" (click)="openImageDialog(theme)" style="cursor: pointer; width: 100%;">
+              <img [src]="themeImageUrls[theme.themeId]" [alt]="theme.themeName" (click)="openImageDialog(theme)" (onKeyUp)="openImageDialog(theme)" style="cursor: pointer; width: 100%;">
             </ng-template>
             <p>{{ theme.themeDescription }}</p>
             <p-chip [label]="theme.cost + ' Points'" styleClass="p-mr-2"></p-chip>
@@ -44,7 +44,7 @@
           <div class="theme-card" *ngFor="let theme of purchasedThemes">
             <p-card [header]="theme.themeName">
               <ng-template pTemplate="header">
-                <img [src]="themeImageUrls[theme.themeId]" [alt]="theme.themeName" (click)="openImageDialog(theme)" style="cursor: pointer; width: 100%;">
+                <img [src]="themeImageUrls[theme.themeId]" [alt]="theme.themeName" (click)="openImageDialog(theme)" (onKeyUp)="openImageDialog(theme)" style="cursor: pointer; width: 100%;">
               </ng-template>
               <p>{{ theme.themeDescription }}</p>
               <ng-template pTemplate="footer">
diff --git a/client/src/app/pages/poam-processing/poam-components/poam-assigned-grid/poam-assigned-grid.component.html b/client/src/app/pages/poam-processing/poam-components/poam-assigned-grid/poam-assigned-grid.component.html
index 54738287..3566621a 100644
--- a/client/src/app/pages/poam-processing/poam-components/poam-assigned-grid/poam-assigned-grid.component.html
+++ b/client/src/app/pages/poam-processing/poam-components/poam-assigned-grid/poam-assigned-grid.component.html
@@ -21,7 +21,7 @@
     </ng-template>
     <ng-template pTemplate="header">
       <tr>
-        <th id="col" *ngFor="let col of assignedColumns">
+        <th scope="col" *ngFor="let col of assignedColumns">
           {{ col }}
         </th>
       </tr>
diff --git a/client/src/app/pages/poam-processing/poam-components/poam-grid/poam-grid.component.html b/client/src/app/pages/poam-processing/poam-components/poam-grid/poam-grid.component.html
index 2f49460c..a8e26903 100644
--- a/client/src/app/pages/poam-processing/poam-components/poam-grid/poam-grid.component.html
+++ b/client/src/app/pages/poam-processing/poam-components/poam-grid/poam-grid.component.html
@@ -15,49 +15,49 @@
             <i class="pi pi-search"></i>
             <input pInputText type="text" [(ngModel)]="globalFilter" (input)="onFilterChange($event)" placeholder="Search..." />
           </span>
-          <p-button label="Clear Filters" [outlined]="true" class="ml-auto" icon="pi pi-filter-slash" (click)="clear(dt)"></p-button>
+          <p-button label="Clear Filters" [outlined]="true" class="ml-auto" icon="pi pi-filter-slash" (click)="clear(dt)" (onKeyUp)="clear(dt)"></p-button>
         </div>
         <div class="table-container" (scroll)="onScroll($event)">
           <p-table #dt [value]="displayedData" [scrollable]="true" scrollHeight="50rem" [paginator]="false" [globalFilterFields]="['poamId', 'status', 'adjSeverity', 'submitter', 'submittedDate', 'scheduledCompletionDate']">
             <ng-template pTemplate="header">
               <tr>
-                <th style="min-width:15rem">
+                <th scope="col" style="min-width:15rem">
                   <div class="flex align-items-center">
                     POAM ID
                     <p-columnFilter type="text" field="poamId" display="menu"></p-columnFilter>
                   </div>
                 </th>
-                <th style="min-width:15rem">
+                <th scope="col" style="min-width:15rem">
                   <div class="flex align-items-center">
                     POAM Status
                     <p-columnFilter type="text" field="status" display="menu"></p-columnFilter>
                   </div>
                 </th>
-                <th style="min-width:15rem">
+                <th scope="col" style="min-width:15rem">
                   <div class="flex align-items-center">
                     Adjusted Severity
                     <p-columnFilter type="text" field="adjSeverity" display="menu"></p-columnFilter>
                   </div>
                 </th>
-                <th style="min-width:15rem">
+                <th scope="col" style="min-width:15rem">
                   <div class="flex align-items-center">
                     Submitter
                     <p-columnFilter type="text" field="submitter" display="menu"></p-columnFilter>
                   </div>
                 </th>
-                <th style="min-width:15rem">
+                <th scope="col" style="min-width:15rem">
                   <div class="flex align-items-center">
                     Submitted Date
                     <p-columnFilter type="text" field="submittedDate" display="menu"></p-columnFilter>
                   </div>
                 </th>
-                <th style="min-width:15rem">
+                <th scope="col" style="min-width:15rem">
                   <div class="flex align-items-center">
                     Scheduled Completion Date
                     <p-columnFilter type="text" field="scheduledCompletionDate" display="menu"></p-columnFilter>
                   </div>
                 </th>
-                <th style="min-width:10rem">
+                <th scope="col" style="min-width:10rem">
                   Manage
                 </th>
               </tr>
diff --git a/client/src/app/pages/poam-processing/poam-details/poam-details.component.html b/client/src/app/pages/poam-processing/poam-details/poam-details.component.html
index a8c48e2e..dbf1f0b4 100644
--- a/client/src/app/pages/poam-processing/poam-details/poam-details.component.html
+++ b/client/src/app/pages/poam-processing/poam-details/poam-details.component.html
@@ -151,8 +151,8 @@
                 <p-table [value]="poamAssignees" [paginator]="false">
                   <ng-template pTemplate="header">
                     <tr>
-                      <th>Members Assigned</th>
-                      <th style="width: 8rem">
+                      <th scope="col">Members Assigned</th>
+                      <th scope="col" style="width: 8rem">
                         <button pButton icon="pi pi-plus" (click)="addAssignee()" class="p-button-rounded p-button-text"></button>
                       </th>
                     </tr>
@@ -191,11 +191,11 @@
                 <p-table [value]="poamApprovers">
                   <ng-template pTemplate="header">
                     <tr>
-                      <th>Approver</th>
-                      <th>Approval Status</th>
-                      <th>Approved Date</th>
-                      <th>Comments</th>
-                      <th style="width: 8rem">
+                      <th scope="col">Approver</th>
+                      <th scope="col">Approval Status</th>
+                      <th scope="col">Approved Date</th>
+                      <th scope="col">Comments</th>
+                      <th scope="col" style="width: 8rem">
                         <button pButton icon="pi pi-plus" (click)="addApprover()" class="p-button-rounded p-button-text"></button>
                       </th>
                     </tr>
@@ -240,8 +240,8 @@
                 <p-table [value]="poamAssets" [paginator]="false">
                   <ng-template pTemplate="header">
                     <tr>
-                      <th>Asset</th>
-                      <th style="width: 8rem">
+                      <th scope="col">Asset</th>
+                      <th scope="col" style="width: 8rem">
                         <button pButton icon="pi pi-plus" (click)="addAsset()" class="p-button-rounded p-button-text"></button>
                       </th>
                     </tr>
@@ -363,10 +363,10 @@
                 <p-table [value]="poamMilestones" dataKey="milestoneId" editMode="row" #dt>
                   <ng-template pTemplate="header">
                     <tr>
-                      <th>Milestone Comments</th>
-                      <th>Milestone Date</th>
-                      <th>Milestone Status</th>
-                      <th><button pButton icon="pi pi-plus" class="p-button-text" (click)="onAddNewMilestone()"></button></th>
+                      <th scope="col">Milestone Comments</th>
+                      <th scope="col">Milestone Date</th>
+                      <th scope="col">Milestone Status</th>
+                      <th scope="col"><button pButton icon="pi pi-plus" class="p-button-text" (click)="onAddNewMilestone()"></button></th>
                     </tr>
                   </ng-template>
                   <ng-template pTemplate="body" let-milestone let-editing="editing" let-ri="rowIndex">
@@ -432,8 +432,8 @@
                 <p-table [value]="poamLabels" [paginator]="false">
                   <ng-template pTemplate="header">
                     <tr>
-                      <th>Label</th>
-                      <th style="width: 8rem">
+                      <th scope="col">Label</th>
+                      <th scope="col" style="width: 8rem">
                         <button pButton icon="pi pi-plus" (click)="addLabel()" class="p-button-rounded p-button-text"></button>
                       </th>
                     </tr>
@@ -490,6 +490,6 @@
 <p-dialog header="{{errorHeader}}" [(visible)]="errorDialogVisible" [modal]="true" [style]="{width: '300px'}" [baseZIndex]="10000">
   <p>{{errorMessage}}</p>
   <ng-template pTemplate="footer">
-    <p-button icon="pi pi-check" (click)="hideErrorDialog()" label="OK" styleClass="p-button-text"></p-button>
+    <p-button icon="pi pi-check" (click)="hideErrorDialog()" (onKeyUp)="hideErrorDialog()" label="OK" styleClass="p-button-text"></p-button>
   </ng-template>
 </p-dialog>
diff --git a/client/src/app/pages/poam-processing/poam-details/poam-details.component.ts b/client/src/app/pages/poam-processing/poam-details/poam-details.component.ts
index 022f8b2a..c9f804bf 100644
--- a/client/src/app/pages/poam-processing/poam-details/poam-details.component.ts
+++ b/client/src/app/pages/poam-processing/poam-details/poam-details.component.ts
@@ -25,6 +25,21 @@ import { ImportService } from '../../import-processing/import.service';
 import { ConfirmationService, MessageService } from 'primeng/api';
 import { Table } from 'primeng/table';
 
+function getRoleFromAccessLevel(accessLevel: number): string {
+  switch (accessLevel) {
+    case 1:
+      return 'viewer';
+    case 2:
+      return 'submitter';
+    case 3:
+      return 'approver';
+    case 4:
+      return 'cat1approver';
+    default:
+      return 'none';
+  }
+}
+
 interface Permission {
   userId: number;
   collectionId: number;
@@ -223,18 +238,18 @@ export class PoamDetailsComponent implements OnInit, OnDestroy {
             };
 
             const selectedPermissions = this.payload.collections.find((x: { collectionId: any; }) => x.collectionId == this.payload.lastCollectionAccessedId);
-            let myRole = '';
+            let myRole: string;
 
             if (!selectedPermissions && !this.user.isAdmin) {
               myRole = 'none';
+            } else if (this.user.isAdmin) {
+              myRole = 'admin';
+            } else if (selectedPermissions) {
+              myRole = getRoleFromAccessLevel(selectedPermissions.accessLevel);
             } else {
-              myRole = (this.user.isAdmin) ? 'admin' :
-                (selectedPermissions.accessLevel === 1) ? 'viewer' :
-                  (selectedPermissions.accessLevel === 2) ? 'submitter' :
-                    (selectedPermissions.accessLevel === 3) ? 'approver' :
-                      (selectedPermissions.accessLevel === 4) ? 'cat1approver' :
-                      'none';
+              myRole = 'none';
             }
+
             this.payload.role = myRole;
             this.showApprove = ['admin', 'cat1approver', 'approver'].includes(this.payload.role);
             this.showClose = ['admin', 'cat1approver', 'approver', 'submitter'].includes(this.payload.role);
diff --git a/client/src/app/pages/poam-processing/poam-extend/poam-extend.component.html b/client/src/app/pages/poam-processing/poam-extend/poam-extend.component.html
index 27d7cc46..d8e69112 100644
--- a/client/src/app/pages/poam-processing/poam-extend/poam-extend.component.html
+++ b/client/src/app/pages/poam-processing/poam-extend/poam-extend.component.html
@@ -43,10 +43,10 @@
         <p-table [value]="poamExtensionMilestones" editMode="row" dataKey="milestoneId">
           <ng-template pTemplate="header">
             <tr>
-              <th>Milestone Comments</th>
-              <th>Milestone Date</th>
-              <th>Milestone Status</th>
-              <th><button pButton icon="pi pi-plus" class="p-button-text" (click)="onAddNewMilestone()"></button></th>
+              <th scope="col">Milestone Comments</th>
+              <th scope="col">Milestone Date</th>
+              <th scope="col">Milestone Status</th>
+              <th scope="col"><button pButton icon="pi pi-plus" class="p-button-text" (click)="onAddNewMilestone()"></button></th>
             </tr>
           </ng-template>
           <ng-template pTemplate="body" let-milestone let-editing="editing" let-ri="rowIndex">
diff --git a/client/src/app/pages/poam-processing/poam-extend/poam-extend.component.scss b/client/src/app/pages/poam-processing/poam-extend/poam-extend.component.scss
index 2c82a160..d6d62e11 100644
--- a/client/src/app/pages/poam-processing/poam-extend/poam-extend.component.scss
+++ b/client/src/app/pages/poam-processing/poam-extend/poam-extend.component.scss
@@ -21,13 +21,6 @@
   margin-bottom: 0.5rem;
 }
 
-.p-field input,
-.p-field p-dropdown,
-.p-field p-autoComplete,
-.p-field textarea {
-  width: 100%;
-}
-
 p-table {
   margin-top: 1rem;
 }
diff --git a/client/src/app/pages/poam-processing/poam-log/poam-log.component.html b/client/src/app/pages/poam-processing/poam-log/poam-log.component.html
index 983292a9..aeb8e7a6 100644
--- a/client/src/app/pages/poam-processing/poam-log/poam-log.component.html
+++ b/client/src/app/pages/poam-processing/poam-log/poam-log.component.html
@@ -13,9 +13,9 @@
     <p-table [value]="dataSource" [scrollable]="true" scrollHeight="flex" [style]="{'max-height':'60vh'}">
       <ng-template pTemplate="header">
         <tr>
-          <th pSortableColumn="Timestamp" style="width: 20%;">Timestamp <p-sortIcon field="Timestamp"></p-sortIcon></th>
-          <th pSortableColumn="User" style="width: 20%;">User <p-sortIcon field="User"></p-sortIcon></th>
-          <th pSortableColumn="Action" style="width: 60%;">Action <p-sortIcon field="Action"></p-sortIcon></th>
+          <th scope="col" pSortableColumn="Timestamp" style="width: 20%;">Timestamp <p-sortIcon field="Timestamp"></p-sortIcon></th>
+          <th scope="col" pSortableColumn="User" style="width: 20%;">User <p-sortIcon field="User"></p-sortIcon></th>
+          <th scope="col" pSortableColumn="Action" style="width: 60%;">Action <p-sortIcon field="Action"></p-sortIcon></th>
         </tr>
       </ng-template>
       <ng-template pTemplate="body" let-row>