diff --git a/src/components/contentcards/CippButtonCard.jsx b/src/components/contentcards/CippButtonCard.jsx
index 8e280ab067d3..a34acbd66142 100644
--- a/src/components/contentcards/CippButtonCard.jsx
+++ b/src/components/contentcards/CippButtonCard.jsx
@@ -22,7 +22,7 @@ export default function CippButtonCard({
         {isFetching && <Skeleton />}
         {children}
       </CCardBody>
-      <CCardFooter>{CardButton}</CCardFooter>
+      {CardButton && <CCardFooter>{CardButton}</CCardFooter>}
     </CCard>
   )
 }
@@ -30,7 +30,7 @@ export default function CippButtonCard({
 CippButtonCard.propTypes = {
   title: PropTypes.string.isRequired,
   titleType: PropTypes.string,
-  CardButton: PropTypes.element.isRequired,
+  CardButton: PropTypes.element,
   children: PropTypes.element.isRequired,
   isFetching: PropTypes.bool,
   className: PropTypes.string,
diff --git a/src/components/tables/CellTable.jsx b/src/components/tables/CellTable.jsx
index cfcbd5403065..2186a406fe6b 100644
--- a/src/components/tables/CellTable.jsx
+++ b/src/components/tables/CellTable.jsx
@@ -23,6 +23,15 @@ export default function cellTable(
   if (columnProp === undefined || columnProp === null) {
     columnProp = []
   } else {
+    var objectLength = 1
+    var lengthText = 'Item'
+    if (columnProp instanceof Array) {
+      objectLength = columnProp.length
+      if (objectLength > 1) {
+        lengthText = 'Items'
+      }
+    }
+
     if (!Array.isArray(columnProp) && typeof columnProp === 'object') {
       columnProp = Object.keys(columnProp).map((key) => {
         return {
@@ -93,7 +102,7 @@ export default function cellTable(
       size="sm"
       onClick={() => handleTable({ columnProp })}
     >
-      {columnProp.length} Items
+      {objectLength} {lengthText}
     </CButton>
   )
 }
diff --git a/src/components/tables/CippTable.jsx b/src/components/tables/CippTable.jsx
index 04ede5a4c204..698ce52d176a 100644
--- a/src/components/tables/CippTable.jsx
+++ b/src/components/tables/CippTable.jsx
@@ -63,7 +63,7 @@ const FilterComponent = ({ filterText, onFilter, onClear, filterlist, onFilterPr
           {filterlist &&
             filterlist.map((item, idx) => {
               return (
-                <CDropdownItem key={idx} onClick={() => onFilterPreset(item.filter)}>
+                <CDropdownItem key={`filter-${idx}`} onClick={() => onFilterPreset(item.filter)}>
                   {item.filterName}
                 </CDropdownItem>
               )
@@ -722,7 +722,7 @@ export default function CippTable({
                 {dataKeys() &&
                   dataKeys().map((item, idx) => {
                     return (
-                      <CDropdownItem key={idx} onClick={() => addColumn(item)}>
+                      <CDropdownItem key={`select-${idx}`} onClick={() => addColumn(item)}>
                         {updatedColumns.find(
                           (o) => o.exportSelector === item && o?.omit !== true,
                         ) && <FontAwesomeIcon icon={faCheck} />}{' '}
@@ -820,7 +820,7 @@ export default function CippTable({
             <CDropdownMenu>
               {actionsList.map((item, idx) => {
                 return (
-                  <CDropdownItem key={idx} onClick={() => executeselectedAction(item)}>
+                  <CDropdownItem key={`actions-${idx}`} onClick={() => executeselectedAction(item)}>
                     {item.label}
                   </CDropdownItem>
                 )
@@ -885,6 +885,7 @@ export default function CippTable({
     updatedColumns,
     addColumn,
     setGraphFilter,
+    isFetching,
   ])
   const tablePageSize = useSelector((state) => state.app.tablePageSize)
   const [codeCopied, setCodeCopied] = useState(false)
@@ -950,8 +951,8 @@ export default function CippTable({
                     const results = message.data?.Results
                     const displayResults = Array.isArray(results) ? results.join(', ') : results
                     return (
-                      <>
-                        <li key={`message-${idx}`}>
+                      <React.Fragment key={`message-${idx}`}>
+                        <li>
                           {displayResults}
                           <CopyToClipboard text={displayResults} onCopy={() => onCodeCopied()}>
                             <CButton
@@ -968,7 +969,7 @@ export default function CippTable({
                             </CButton>
                           </CopyToClipboard>
                         </li>
-                      </>
+                      </React.Fragment>
                     )
                   })}
                 {loopRunning && (
@@ -1008,11 +1009,12 @@ export default function CippTable({
               progressPending={isFetching}
               progressComponent={<CSpinner color="info" component="div" />}
               paginationRowsPerPageOptions={[25, 50, 100, 200, 500]}
+              keyField={keyField}
               {...rest}
             />
             {selectedRows.length >= 1 && <CCallout>Selected {selectedRows.length} items</CCallout>}
             <CippCodeOffCanvas
-              row={data}
+              row={data ?? {}}
               hideButton={true}
               state={codeOffcanvasVisible}
               hideFunction={() => setCodeOffcanvasVisible(false)}
diff --git a/src/components/utilities/CippActionsOffcanvas.jsx b/src/components/utilities/CippActionsOffcanvas.jsx
index e543a511ffb1..7287af9722da 100644
--- a/src/components/utilities/CippActionsOffcanvas.jsx
+++ b/src/components/utilities/CippActionsOffcanvas.jsx
@@ -38,11 +38,11 @@ import { faGlobe } from '@fortawesome/free-solid-svg-icons'
 import { cellGenericFormatter } from '../tables/CellGenericFormat'
 import ReactSelect from 'react-select'
 
-const CippOffcanvasCard = ({ action, key }) => {
+const CippOffcanvasCard = ({ action }) => {
   const [offcanvasVisible, setOffcanvasVisible] = useState(false)
   return (
     <>
-      <CCard key={key} className="border-top-dark border-top-3 mb-3">
+      <CCard className="border-top-dark border-top-3 mb-3">
         <CCardHeader className="d-flex justify-content-between align-items-center">
           <CCardTitle>Report Name: {action.label}</CCardTitle>
         </CCardHeader>
@@ -95,7 +95,6 @@ const CippOffcanvasCard = ({ action, key }) => {
 }
 CippOffcanvasCard.propTypes = {
   action: PropTypes.object,
-  key: PropTypes.object,
 }
 
 export default function CippActionsOffcanvas(props) {
diff --git a/src/components/utilities/CippAppPermissionBuilder.jsx b/src/components/utilities/CippAppPermissionBuilder.jsx
index 6f52e44f30ec..c986b67145f2 100644
--- a/src/components/utilities/CippAppPermissionBuilder.jsx
+++ b/src/components/utilities/CippAppPermissionBuilder.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react'
+import React, { useEffect, useRef, useState, useCallback } from 'react'
 import {
   CButton,
   CCallout,
@@ -13,24 +13,35 @@ import {
 } from '@coreui/react'
 import { Field, Form, FormSpy } from 'react-final-form'
 import { RFFCFormRadioList, RFFSelectSearch } from 'src/components/forms'
-import { useGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
+import { useGenericGetRequestQuery, useLazyGenericGetRequestQuery } from 'src/store/api/app'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { TenantSelectorMultiple, ModalService, CippOffcanvas } from 'src/components/utilities'
+import {
+  TenantSelectorMultiple,
+  ModalService,
+  CippOffcanvas,
+  CippCodeBlock,
+} from 'src/components/utilities'
 import PropTypes from 'prop-types'
 import { OnChange } from 'react-final-form-listeners'
 import { useListTenantsQuery } from 'src/store/api/tenants'
-import { OffcanvasListSection } from 'src/components/utilities/CippListOffcanvas'
 import CippButtonCard from 'src/components/contentcards/CippButtonCard'
 import { CippTable } from '../tables'
 import { Row } from 'react-bootstrap'
 import { cellGenericFormatter } from '../tables/CellGenericFormat'
 import Skeleton from 'react-loading-skeleton'
-import { uniqueId } from 'lodash-es'
+import CippDropzone from './CippDropzone'
+import { Editor } from '@monaco-editor/react'
+import { useSelector } from 'react-redux'
+import { CippCallout } from '../layout'
 
 const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitting }) => {
   const [selectedApp, setSelectedApp] = useState([])
   const [permissionsImported, setPermissionsImported] = useState(false)
   const [newPermissions, setNewPermissions] = useState({})
+  const [importedManifest, setImportedManifest] = useState(null)
+  const [manifestVisible, setManifestVisible] = useState(false)
+  const currentTheme = useSelector((state) => state.app.currentTheme)
+  const [calloutMessage, setCalloutMessage] = useState(null)
 
   const {
     data: servicePrincipals = [],
@@ -42,6 +53,8 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
     path: 'api/ExecServicePrincipals',
   })
 
+  const [createServicePrincipal, createResult] = useLazyGenericGetRequestQuery()
+
   const removeServicePrincipal = (appId) => {
     var servicePrincipal = selectedApp.find((sp) => sp?.appId === appId)
     var newServicePrincipals = selectedApp.filter((sp) => sp?.appId !== appId)
@@ -65,6 +78,8 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
       onConfirm: () => {
         setSelectedApp([])
         setPermissionsImported(false)
+        setManifestVisible(false)
+        setCalloutMessage('Permissions reset to default.')
       },
     })
   }
@@ -78,6 +93,15 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
     }
   }
 
+  const onCreateServicePrincipal = (appId) => {
+    createServicePrincipal({
+      path: 'api/ExecServicePrincipals?Action=Create&AppId=' + appId,
+    }).then(() => {
+      refetchSpList()
+      setCalloutMessage(createResult?.data?.Results)
+    })
+  }
+
   const addPermissionRow = (servicePrincipal, permissionType, permission) => {
     var updatedPermissions = JSON.parse(JSON.stringify(newPermissions))
 
@@ -91,7 +115,7 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
     var newPermission = []
     if (currentPermission) {
       currentPermission.map((perm) => {
-        if (perm.id.lower() !== permission.value.lower()) {
+        if (perm.id !== permission.value) {
           newPermission.push(perm)
         }
       })
@@ -150,6 +174,8 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
         requiredResourceAccess: [],
       }
 
+      var additionalPermissions = []
+
       selectedApp.map((sp) => {
         var appRoles = newPermissions?.Permissions[sp.appId]?.applicationPermissions
         var delegatedPermissions = newPermissions?.Permissions[sp.appId]?.delegatedPermissions
@@ -157,24 +183,40 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
           resourceAppId: sp.appId,
           resourceAccess: [],
         }
-        appRoles.map((role) => {
-          requiredResourceAccess.resourceAccess.push({
-            id: role.id,
-            type: 'Role',
-          })
-        })
-        delegatedPermissions.map((perm) => {
-          // permission not a guid skip
-          if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(perm.id)) {
+        var additionalRequiredResourceAccess = {
+          resourceAppId: sp.appId,
+          resourceAccess: [],
+        }
+        if (appRoles) {
+          appRoles.map((role) => {
             requiredResourceAccess.resourceAccess.push({
-              id: perm.id,
-              type: 'Scope',
+              id: role.id,
+              type: 'Role',
             })
-          }
-        })
+          })
+        }
+        if (delegatedPermissions) {
+          delegatedPermissions.map((perm) => {
+            // permission not a guid skip
+            if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(perm.id)) {
+              requiredResourceAccess.resourceAccess.push({
+                id: perm.id,
+                type: 'Scope',
+              })
+            } else {
+              additionalRequiredResourceAccess.resourceAccess.push({
+                id: perm.id,
+                type: 'Scope',
+              })
+            }
+          })
+        }
         if (requiredResourceAccess.resourceAccess.length > 0) {
           manifest.requiredResourceAccess.push(requiredResourceAccess)
         }
+        if (additionalRequiredResourceAccess.resourceAccess.length > 0) {
+          additionalPermissions.push(additionalRequiredResourceAccess)
+        }
       })
 
       var fileName = `${appDisplayName.replace(' ', '-')}.json`
@@ -186,12 +228,94 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
       var url = URL.createObjectURL(blob)
       var a = document.createElement('a')
       a.href = url
-      a.download = `${fileName}.json`
+      a.download = `${fileName}`
       a.click()
+      URL.revokeObjectURL(url)
+
+      if (additionalPermissions.length > 0) {
+        ModalService.confirm({
+          title: 'Additional Permissions',
+          body: 'Some permissions are not supported in the manifest. Would you like to download them?',
+          confirmLabel: 'Download',
+          onConfirm: () => {
+            var additionalBlob = new Blob([JSON.stringify(additionalPermissions, null, 2)], {
+              type: 'application/json',
+            })
+            var additionalUrl = URL.createObjectURL(additionalBlob)
+            var additionalA = document.createElement('a')
+            additionalA.href = additionalUrl
+            additionalA.download = 'AdditionalPermissions.json'
+            additionalA.click()
+            URL.revokeObjectURL(additionalUrl)
+          },
+        })
+      }
     }
   }
 
-  const importManifest = () => {}
+  const importManifest = () => {
+    var updatedPermissions = { Permissions: {} }
+    var manifest = importedManifest
+    var requiredResourceAccess = manifest.requiredResourceAccess
+    var selectedServicePrincipals = []
+
+    requiredResourceAccess.map((resourceAccess) => {
+      var sp = servicePrincipals?.Results?.find((sp) => sp.appId === resourceAccess.resourceAppId)
+      if (sp) {
+        var appRoles = []
+        var delegatedPermissions = []
+        selectedServicePrincipals.push(sp)
+        resourceAccess.resourceAccess.map((access) => {
+          if (access.type === 'Role') {
+            var role = sp.appRoles.find((role) => role.id === access.id)
+            if (role) {
+              appRoles.push({
+                id: role.id,
+                value: role.value,
+              })
+            }
+          } else if (access.type === 'Scope') {
+            var scope = sp.publishedPermissionScopes.find((scope) => scope.id === access.id)
+            if (scope) {
+              delegatedPermissions.push({
+                id: scope.id,
+                value: scope.value,
+              })
+            }
+          }
+        })
+        updatedPermissions.Permissions[sp.appId] = {
+          applicationPermissions: appRoles,
+          delegatedPermissions: delegatedPermissions,
+        }
+      }
+    })
+    setNewPermissions(updatedPermissions)
+    setSelectedApp(selectedServicePrincipals)
+    setImportedManifest(null)
+    setPermissionsImported(true)
+    setManifestVisible(false)
+    setCalloutMessage('Manifest imported successfully.')
+  }
+
+  const onManifestImport = useCallback((acceptedFiles) => {
+    acceptedFiles.forEach((file) => {
+      const reader = new FileReader()
+      reader.onabort = () => console.log('file reading was aborted')
+      reader.onerror = () => console.log('file reading has failed')
+      reader.onload = () => {
+        console.log(reader.result)
+        try {
+          var manifest = JSON.parse(reader.result)
+          setImportedManifest(manifest)
+          console.log(importedManifest)
+        } catch {
+          console.log('invalid manifest')
+        }
+      }
+      reader.readAsText(file)
+    })
+  }, [])
 
   useEffect(() => {
     try {
@@ -213,7 +337,6 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
           },
         },
       })
-      setPermissionsImported(true)
     } else if (spSuccess && initialAppIds.length > 0 && permissionsImported == false) {
       var newApps = []
       initialAppIds?.map((appId) => {
@@ -241,7 +364,6 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
   ])
 
   const ApiPermissionRow = ({ servicePrincipal = null }) => {
-    const [offcanvasVisible, setOffcanvasVisible] = useState(false)
     return (
       <>
         {spSuccess && servicePrincipal !== null && (
@@ -336,6 +458,7 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
                       </CRow>
                       <div className="px-4">
                         <CippTable
+                          reportName={`${servicePrincipal.displayName} Application Permissions`}
                           data={
                             newPermissions?.Permissions[servicePrincipal?.appId]
                               ?.applicationPermissions ?? []
@@ -475,6 +598,7 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
 
                   <div className="px-4 mb-3">
                     <CippTable
+                      reportName={`${servicePrincipal.displayName} Delegated Permissions`}
                       data={
                         newPermissions?.Permissions[servicePrincipal?.appId]
                           ?.delegatedPermissions ?? []
@@ -570,7 +694,7 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
                             refreshFunction={() => refetchSpList()}
                             allowCreate={true}
                             onCreateOption={(newSp) => {
-                              console.log(newSp)
+                              onCreateServicePrincipal(newSp)
                             }}
                             placeholder="(Advanced) Select a Service Principal"
                           />
@@ -626,7 +750,7 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
                         <CTooltip content="Import Manifest">
                           <CButton
                             onClick={() => {
-                              importManifest()
+                              setManifestVisible(true)
                             }}
                             className={`circular-button`}
                             title={'+'}
@@ -636,7 +760,146 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
                         </CTooltip>
                       </CCol>
                     </CRow>
+                    <CippOffcanvas
+                      title="Import Manifest"
+                      id="importManifest"
+                      visible={manifestVisible}
+                      onHide={() => {
+                        setManifestVisible(false)
+                      }}
+                      addedClass="offcanvas-large"
+                      placement="end"
+                    >
+                      <CRow>
+                        <CCol xl={12}>
+                          <p>
+                            Import a JSON application manifest to set permissions. This will
+                            overwrite any existing permissions.
+                          </p>
+                        </CCol>
+                      </CRow>
+                      <CRow>
+                        <CCol xl={12}>
+                          <CippDropzone
+                            onDrop={onManifestImport}
+                            accept={{ 'application/json': ['.json'] }}
+                            dropMessage="Drag a JSON app manifest here, or click to select one."
+                            maxFiles={1}
+                            returnCard={false}
+                          />
+                        </CCol>
+                      </CRow>
+                      {importedManifest && (
+                        <>
+                          <CRow className="mt-4">
+                            <CCol xl={12}>
+                              <CButton onClick={() => importManifest()}>
+                                <FontAwesomeIcon icon="save" className="me-2" /> Import
+                              </CButton>
+                            </CCol>
+                          </CRow>
+                          <CRow className="mt-3">
+                            <CCol xl={12}>
+                              <h4>Preview</h4>
+                              <CippCodeBlock
+                                code={JSON.stringify(importedManifest, null, 2)}
+                                language="json"
+                                showLineNumbers={false}
+                              />
+                            </CCol>
+                          </CRow>
+                        </>
+                      )}
+                    </CippOffcanvas>
+                    {calloutMessage && (
+                      <CRow>
+                        <CCol>
+                          <CippCallout dismissible={true} color="info">
+                            <FontAwesomeIcon icon="info-circle" className="me-2" />
+                            {calloutMessage}
+                          </CippCallout>
+                        </CCol>
+                      </CRow>
+                    )}
 
+                    {newPermissions?.MissingPermissions &&
+                      newPermissions?.Type === 'Table' &&
+                      Object.keys(newPermissions?.MissingPermissions).length > 0 && (
+                        <CRow>
+                          <CCol>
+                            <CCallout color="warning">
+                              <CRow>
+                                <CCol xl={10} sm={12}>
+                                  <FontAwesomeIcon icon="exclamation-triangle" className="me-2" />
+                                  <b>New Permissions Available</b>
+                                  {Object.keys(newPermissions?.MissingPermissions).map((perm) => {
+                                    // translate appid to display name
+                                    var sp = servicePrincipals?.Results?.find(
+                                      (sp) => sp.appId === perm,
+                                    )
+                                    return (
+                                      <div key={`missing-${perm}`}>
+                                        {sp?.displayName}:{' '}
+                                        {Object.keys(newPermissions?.MissingPermissions[perm]).map(
+                                          (type) => {
+                                            return (
+                                              <>
+                                                {newPermissions?.MissingPermissions[perm][type]
+                                                  .length > 0 && (
+                                                  <span key={`missing-${perm}-${type}`}>
+                                                    {type == 'applicationPermissions'
+                                                      ? 'Application'
+                                                      : 'Delegated'}{' '}
+                                                    -{' '}
+                                                    {newPermissions?.MissingPermissions[perm][type]
+                                                      .map((p) => {
+                                                        return p.value
+                                                      })
+                                                      .join(', ')}
+                                                  </span>
+                                                )}
+                                              </>
+                                            )
+                                          },
+                                        )}
+                                      </div>
+                                    )
+                                  })}
+                                </CCol>
+                                <CCol xl={2} sm={12} className="my-auto">
+                                  <CTooltip content="Add Missing Permissions">
+                                    <CButton
+                                      onClick={() => {
+                                        var updatedPermissions = JSON.parse(
+                                          JSON.stringify(newPermissions),
+                                        )
+                                        Object.keys(newPermissions?.MissingPermissions).map(
+                                          (perm) => {
+                                            Object.keys(
+                                              newPermissions?.MissingPermissions[perm],
+                                            ).map((type) => {
+                                              newPermissions?.MissingPermissions[perm][type].map(
+                                                (p) => {
+                                                  updatedPermissions.Permissions[perm][type].push(p)
+                                                },
+                                              )
+                                            })
+                                          },
+                                        )
+                                        updatedPermissions.MissingPermissions = {}
+                                        setNewPermissions(updatedPermissions)
+                                      }}
+                                      className={`circular-button float-end`}
+                                    >
+                                      <FontAwesomeIcon icon="wrench" />
+                                    </CButton>
+                                  </CTooltip>
+                                </CCol>
+                              </CRow>
+                            </CCallout>
+                          </CCol>
+                        </CRow>
+                      )}
                     <CAccordion>
                       <>
                         {selectedApp?.length > 0 &&
@@ -648,7 +911,10 @@ const CippAppPermissionBuilder = ({ onSubmit, currentPermissions = {}, isSubmitt
                               <CAccordionHeader>{sp.displayName}</CAccordionHeader>
                               <CAccordionBody>
                                 <CRow>
-                                  <ApiPermissionRow servicePrincipal={sp} />
+                                  <ApiPermissionRow
+                                    servicePrincipal={sp}
+                                    key={`apirow-${spIndex}`}
+                                  />
                                 </CRow>
                               </CAccordionBody>
                             </CAccordionItem>
diff --git a/src/components/utilities/CippCodeOffcanvas.jsx b/src/components/utilities/CippCodeOffcanvas.jsx
index a9b5cf41a055..10920c368722 100644
--- a/src/components/utilities/CippCodeOffcanvas.jsx
+++ b/src/components/utilities/CippCodeOffcanvas.jsx
@@ -44,7 +44,7 @@ function CippCodeOffCanvas({
         addedClass="offcanvas-large"
         placement="end"
         visible={visible}
-        id={row}
+        id={crypto.randomUUID()}
         hideFunction={hideFunction}
       >
         <Editor
@@ -99,7 +99,7 @@ function CippCodeOffCanvas({
 }
 
 CippCodeOffCanvas.propTypes = {
-  row: PropTypes.object,
+  row: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
   state: PropTypes.bool,
   hideFunction: PropTypes.func,
   type: PropTypes.string,
diff --git a/src/components/utilities/CippDropzone.jsx b/src/components/utilities/CippDropzone.jsx
index e42ab066ae6f..4623b03401bd 100644
--- a/src/components/utilities/CippDropzone.jsx
+++ b/src/components/utilities/CippDropzone.jsx
@@ -49,21 +49,40 @@ const Container = styled.div`
   transition: border 0.24s ease-in-out;
 `
 
-const CippDropzone = ({ title, onDrop, dropMessage, accept, maxFiles = 1, ...props }) => {
+const CippDropzone = ({
+  title,
+  onDrop,
+  dropMessage,
+  accept,
+  maxFiles = 1,
+  returnCard = true,
+  ...props
+}) => {
   const { getRootProps, getInputProps, isFocused, isDragAccept, isDragReject } = useDropzone({
     onDrop,
     accept: accept,
     maxFiles: maxFiles,
   })
   return (
-    <CippContentCard title={title} {...props}>
-      <div className="container my-2">
-        <Container {...getRootProps({ isFocused, isDragAccept, isDragReject })}>
-          <input {...getInputProps()} />
-          <span>{dropMessage}</span>
-        </Container>
-      </div>
-    </CippContentCard>
+    <>
+      {returnCard ? (
+        <CippContentCard title={title} {...props}>
+          <div className="container my-2">
+            <Container {...getRootProps({ isFocused, isDragAccept, isDragReject })}>
+              <input {...getInputProps()} />
+              <span>{dropMessage}</span>
+            </Container>
+          </div>
+        </CippContentCard>
+      ) : (
+        <div className="container my-2">
+          <Container {...getRootProps({ isFocused, isDragAccept, isDragReject })}>
+            <input {...getInputProps()} />
+            <span>{dropMessage}</span>
+          </Container>
+        </div>
+      )}
+    </>
   )
 }
 
@@ -73,6 +92,7 @@ CippDropzone.propTypes = {
   dropMessage: PropTypes.string,
   accept: PropTypes.object,
   maxFiles: PropTypes.number,
+  returnCard: PropTypes.bool,
 }
 
 export default CippDropzone
diff --git a/src/data/alerts.json b/src/data/alerts.json
index 835216740c4d..13f18265caf4 100644
--- a/src/data/alerts.json
+++ b/src/data/alerts.json
@@ -99,5 +99,11 @@
     "name": "DeviceCompliance",
     "label": "Alert on device compliance issues",
     "recommendedRunInterval": "4h"
+  },
+  {
+    "name": "HuntressRogueApps",
+    "label": "Alert on Huntress Rogue Apps detected",
+    "recommendedRunInterval": "4h",
+    "description": "Huntress has provided a repository of known rogue apps that are commonly used in BEC, data exfiltration and other Microsoft 365 attacks. This alert will notify you if any of these apps are detected in the selected tenant(s). For more information, see <a href='https://huntresslabs.github.io/rogueapps/' target='_blank'>https://huntresslabs.github.io/rogueapps/</a>."
   }
 ]
diff --git a/src/views/cipp/app-settings/SettingsNotifications.jsx b/src/views/cipp/app-settings/SettingsNotifications.jsx
index 781d2ac72e6a..f38bb2f1fd1f 100644
--- a/src/views/cipp/app-settings/SettingsNotifications.jsx
+++ b/src/views/cipp/app-settings/SettingsNotifications.jsx
@@ -64,145 +64,147 @@ export function SettingsNotifications() {
         }
         isFetching={notificationListResult.isFetching}
       >
-        {notificationListResult.isUninitialized && listNotification()}
-        {notificationListResult.isFetching ||
-          (generateAlertResult.isFetching && (
-            <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
-          ))}
-        {!notificationListResult.isFetching && notificationListResult.error && (
-          <CippCallout color="danger">Error loading data</CippCallout>
-        )}
-        {notificationListResult.isSuccess && (
-          <Form
-            initialValuesEqual={() => true}
-            initialValues={{
-              ...notificationListResult.data,
-              logsToInclude: notificationListResult.data?.logsToInclude?.map((m) => ({
-                label: m,
-                value: m,
-              })),
-              Severity: notificationListResult.data?.Severity?.map((s) => ({
-                label: s,
-                value: s,
-              })),
-            }}
-            onSubmit={onSubmit}
-            render={({ handleSubmit, submitting, values }) => {
-              return (
-                <CForm id="notificationform" onSubmit={handleSubmit}>
-                  {notificationConfigResult.isFetching && (
-                    <CippCallout color="success">
-                      <CSpinner>Loading</CSpinner>
-                    </CippCallout>
-                  )}
-                  {notificationConfigResult.isSuccess && !notificationConfigResult.isFetching && (
-                    <CippCallout color="success" dismissible>
-                      {notificationConfigResult.data?.Results}
-                    </CippCallout>
-                  )}
-                  {notificationConfigResult.isError && !notificationConfigResult.isFetching && (
-                    <CippCallout color="danger">
-                      Could not connect to API: {notificationConfigResult.error.message}
-                    </CippCallout>
-                  )}
-                  <CCol>
-                    <CCol>
-                      <RFFCFormInput
-                        type="text"
-                        name="email"
-                        label="E-mail (Separate multiple E-mails with commas e.g.: matt@example.com, joe@sample.com)"
-                      />
-                    </CCol>
-                    <CCol>
-                      <RFFCFormInput type="text" name="webhook" label="Webhook" />
-                    </CCol>
-                    <CCol>
-                      <RFFSelectSearch
-                        multi={true}
-                        label="Choose which logs you'd like to receive alerts from. This notification will be sent every 15 minutes."
-                        name="logsToInclude"
-                        values={[
-                          { value: 'Updates', name: 'Updates Status' },
-                          { value: 'Standards', name: 'All Standards' },
-                          { value: 'TokensUpdater', name: 'Token Events' },
-                          {
-                            value: 'ExecDnsConfig',
-                            name: 'Changing DNS Settings',
-                          },
-                          {
-                            value: 'ExecExcludeLicenses',
-                            name: 'Adding excluded licenses',
-                          },
-                          {
-                            value: 'ExecExcludeTenant',
-                            name: 'Adding excluded tenants',
-                          },
-                          { value: 'EditUser', name: 'Editing a user' },
-                          {
-                            value: 'ChocoApp',
-                            name: 'Adding or deploying applications',
-                          },
-                          {
-                            value: 'AddAPDevice',
-                            name: 'Adding autopilot devices',
-                          },
-                          { value: 'EditTenant', name: 'Editing a tenant' },
-                          { value: 'AddMSPApp', name: 'Adding an MSP app' },
-                          { value: 'AddUser', name: 'Adding a user' },
-                          { value: 'AddGroup', name: 'Adding a group' },
-                          { value: 'NewTenant', name: 'Adding a tenant' },
-                          {
-                            value: 'ExecOffboardUser',
-                            name: 'Executing the offboard wizard',
-                          },
-                        ]}
-                      />
-                    </CCol>
-                    <CCol className="mb-3">
-                      <RFFSelectSearch
-                        multi={true}
-                        label="Choose which severity of alert you want to be notified for."
-                        name="Severity"
-                        values={[
-                          { value: 'Alert', name: 'Alert' },
-                          { value: 'Error', name: 'Error' },
-                          { value: 'Info', name: 'Info' },
-                          { value: 'Warning', name: 'Warning' },
-                          { value: 'Critical', name: 'Critical' },
-                        ]}
-                      />
-                    </CCol>
-                    <CCol>
-                      <RFFCFormSwitch
-                        name="onePerTenant"
-                        label="Receive one email per tenant"
-                        value={false}
-                      />
-                    </CCol>
-                    <CCol>
-                      <RFFCFormSwitch
-                        name="sendtoIntegration"
-                        label="Send notifications to configured integration(s)"
-                        value={false}
-                      />
-                    </CCol>
+        <>
+          {notificationListResult.isUninitialized && listNotification()}
+          {notificationListResult.isFetching ||
+            (generateAlertResult.isFetching && (
+              <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
+            ))}
+          {!notificationListResult.isFetching && notificationListResult.error && (
+            <CippCallout color="danger">Error loading data</CippCallout>
+          )}
+          {notificationListResult.isSuccess && (
+            <Form
+              initialValuesEqual={() => true}
+              initialValues={{
+                ...notificationListResult.data,
+                logsToInclude: notificationListResult.data?.logsToInclude?.map((m) => ({
+                  label: m,
+                  value: m,
+                })),
+                Severity: notificationListResult.data?.Severity?.map((s) => ({
+                  label: s,
+                  value: s,
+                })),
+              }}
+              onSubmit={onSubmit}
+              render={({ handleSubmit, submitting, values }) => {
+                return (
+                  <CForm id="notificationform" onSubmit={handleSubmit}>
+                    {notificationConfigResult.isFetching && (
+                      <CippCallout color="success">
+                        <CSpinner>Loading</CSpinner>
+                      </CippCallout>
+                    )}
+                    {notificationConfigResult.isSuccess && !notificationConfigResult.isFetching && (
+                      <CippCallout color="success" dismissible>
+                        {notificationConfigResult.data?.Results}
+                      </CippCallout>
+                    )}
+                    {notificationConfigResult.isError && !notificationConfigResult.isFetching && (
+                      <CippCallout color="danger">
+                        Could not connect to API: {notificationConfigResult.error.message}
+                      </CippCallout>
+                    )}
                     <CCol>
-                      <RFFCFormSwitch
-                        name="includeTenantId"
-                        label="Include Tenant ID in alerts"
-                        value={false}
-                      />
+                      <CCol>
+                        <RFFCFormInput
+                          type="text"
+                          name="email"
+                          label="E-mail (Separate multiple E-mails with commas e.g.: matt@example.com, joe@sample.com)"
+                        />
+                      </CCol>
+                      <CCol>
+                        <RFFCFormInput type="text" name="webhook" label="Webhook" />
+                      </CCol>
+                      <CCol>
+                        <RFFSelectSearch
+                          multi={true}
+                          label="Choose which logs you'd like to receive alerts from. This notification will be sent every 15 minutes."
+                          name="logsToInclude"
+                          values={[
+                            { value: 'Updates', name: 'Updates Status' },
+                            { value: 'Standards', name: 'All Standards' },
+                            { value: 'TokensUpdater', name: 'Token Events' },
+                            {
+                              value: 'ExecDnsConfig',
+                              name: 'Changing DNS Settings',
+                            },
+                            {
+                              value: 'ExecExcludeLicenses',
+                              name: 'Adding excluded licenses',
+                            },
+                            {
+                              value: 'ExecExcludeTenant',
+                              name: 'Adding excluded tenants',
+                            },
+                            { value: 'EditUser', name: 'Editing a user' },
+                            {
+                              value: 'ChocoApp',
+                              name: 'Adding or deploying applications',
+                            },
+                            {
+                              value: 'AddAPDevice',
+                              name: 'Adding autopilot devices',
+                            },
+                            { value: 'EditTenant', name: 'Editing a tenant' },
+                            { value: 'AddMSPApp', name: 'Adding an MSP app' },
+                            { value: 'AddUser', name: 'Adding a user' },
+                            { value: 'AddGroup', name: 'Adding a group' },
+                            { value: 'NewTenant', name: 'Adding a tenant' },
+                            {
+                              value: 'ExecOffboardUser',
+                              name: 'Executing the offboard wizard',
+                            },
+                          ]}
+                        />
+                      </CCol>
+                      <CCol className="mb-3">
+                        <RFFSelectSearch
+                          multi={true}
+                          label="Choose which severity of alert you want to be notified for."
+                          name="Severity"
+                          values={[
+                            { value: 'Alert', name: 'Alert' },
+                            { value: 'Error', name: 'Error' },
+                            { value: 'Info', name: 'Info' },
+                            { value: 'Warning', name: 'Warning' },
+                            { value: 'Critical', name: 'Critical' },
+                          ]}
+                        />
+                      </CCol>
+                      <CCol>
+                        <RFFCFormSwitch
+                          name="onePerTenant"
+                          label="Receive one email per tenant"
+                          value={false}
+                        />
+                      </CCol>
+                      <CCol>
+                        <RFFCFormSwitch
+                          name="sendtoIntegration"
+                          label="Send notifications to configured integration(s)"
+                          value={false}
+                        />
+                      </CCol>
+                      <CCol>
+                        <RFFCFormSwitch
+                          name="includeTenantId"
+                          label="Include Tenant ID in alerts"
+                          value={false}
+                        />
+                      </CCol>
                     </CCol>
-                  </CCol>
-                </CForm>
-              )
-            }}
-          />
-        )}
-        <small>
-          Use the button below to save the changes, or generate a test alert. The test alert will be
-          processed in a batch with other alerts
-        </small>
+                  </CForm>
+                )
+              }}
+            />
+          )}
+          <small>
+            Use the button below to save the changes, or generate a test alert. The test alert will
+            be processed in a batch with other alerts
+          </small>
+        </>
       </CippButtonCard>
     </CCol>
   )
diff --git a/src/views/cipp/app-settings/SettingsPartner.jsx b/src/views/cipp/app-settings/SettingsPartner.jsx
index b569b9c33c24..823844ac56b5 100644
--- a/src/views/cipp/app-settings/SettingsPartner.jsx
+++ b/src/views/cipp/app-settings/SettingsPartner.jsx
@@ -24,6 +24,7 @@ import React, { useEffect } from 'react'
 import { CippCallout } from 'src/components/layout/index.js'
 import { CippCodeBlock } from 'src/components/utilities'
 import { CellDate } from 'src/components/tables'
+import Skeleton from 'react-loading-skeleton'
 
 /**
  * Sets the notification settings.
@@ -148,17 +149,21 @@ export function SettingsPartner() {
                     render={({ handleSubmit }) => (
                       <>
                         <CForm onSubmit={handleSubmit}>
-                          <RFFSelectSearch
-                            name="EventType"
-                            label="Event Types"
-                            values={webhookEvents.data?.Results?.map((event) => ({
-                              name: event,
-                              value: event,
-                            }))}
-                            multi={true}
-                            refreshFunction={() => webhookEvents.refetch()}
-                            helpText="Select the events you want to receive notifications for."
-                          />
+                          {webhookEvents.isSuccess ? (
+                            <RFFSelectSearch
+                              name="EventType"
+                              label="Event Types"
+                              values={webhookEvents.data?.Results?.map((event) => ({
+                                name: event,
+                                value: event,
+                              }))}
+                              multi={true}
+                              refreshFunction={() => webhookEvents.refetch()}
+                              helpText="Select the events you want to receive notifications for."
+                            />
+                          ) : (
+                            <Skeleton />
+                          )}
                           <RFFCFormSwitch
                             name="standardsExcludeAllTenants"
                             helpText='Enabling this feature excludes tenants from any top-level
diff --git a/src/views/cipp/app-settings/SettingsWebhookSubscriptions.jsx b/src/views/cipp/app-settings/SettingsWebhookSubscriptions.jsx
index 965e13b57b90..61d74b736f06 100644
--- a/src/views/cipp/app-settings/SettingsWebhookSubscriptions.jsx
+++ b/src/views/cipp/app-settings/SettingsWebhookSubscriptions.jsx
@@ -49,6 +49,7 @@ export function SettingsWebhookSubscriptions() {
           path: 'api/ExecWebhookSubscriptions',
           reportName: `Log Subscriptions`,
           tableProps: {
+            keyField: 'RowKey',
             selectableRows: true,
             actionsList: [
               {
diff --git a/src/views/cipp/app-settings/components/SettingsAppPermissions.jsx b/src/views/cipp/app-settings/components/SettingsAppPermissions.jsx
index c3b6da3ffbd7..d36dffb0b597 100644
--- a/src/views/cipp/app-settings/components/SettingsAppPermissions.jsx
+++ b/src/views/cipp/app-settings/components/SettingsAppPermissions.jsx
@@ -28,13 +28,18 @@ const SettingsAppPermissions = () => {
     genericPostRequest({
       path: 'api/ExecSAMAppPermissions?Action=Update',
       values: values,
+    }).then(() => {
+      refetchSam()
     })
   }
 
-  const { data: samAppPermissions = [], isFetching: samAppPermissionsFetching } =
-    useGenericGetRequestQuery({
-      path: 'api/ExecSAMAppPermissions',
-    })
+  const {
+    data: samAppPermissions = [],
+    isFetching: samAppPermissionsFetching,
+    refetch: refetchSam,
+  } = useGenericGetRequestQuery({
+    path: 'api/ExecSAMAppPermissions',
+  })
 
   return (
     <CippButtonCard title="CIPP-SAM API Permissions" titleType="big">
diff --git a/src/views/cipp/app-settings/components/SettingsSAMRoles.jsx b/src/views/cipp/app-settings/components/SettingsSAMRoles.jsx
index ebc8310b6abd..fdce15fb39cd 100644
--- a/src/views/cipp/app-settings/components/SettingsSAMRoles.jsx
+++ b/src/views/cipp/app-settings/components/SettingsSAMRoles.jsx
@@ -14,11 +14,10 @@ import { Field, Form, FormSpy } from 'react-final-form'
 import { RFFCFormRadioList, RFFSelectSearch } from 'src/components/forms'
 import { useGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { TenantSelectorMultiple, ModalService, CippOffcanvas } from 'src/components/utilities'
+import { TenantSelectorMultiple, ModalService } from 'src/components/utilities'
 import PropTypes from 'prop-types'
 import { OnChange } from 'react-final-form-listeners'
 import { useListTenantsQuery } from 'src/store/api/tenants'
-import { OffcanvasListSection } from 'src/components/utilities/CippListOffcanvas'
 import CippButtonCard from 'src/components/contentcards/CippButtonCard'
 import GDAPRoles from 'src/data/GDAPRoles'
 
diff --git a/src/views/email-exchange/connectors/ConnectorList.jsx b/src/views/email-exchange/connectors/ConnectorList.jsx
index c18d5eeb0004..1f3829abcb1d 100644
--- a/src/views/email-exchange/connectors/ConnectorList.jsx
+++ b/src/views/email-exchange/connectors/ConnectorList.jsx
@@ -57,7 +57,7 @@ const Offcanvas = (row, rowIndex, formatExtraData) => {
             modal: true,
             icon: <FontAwesomeIcon icon={faTrash} className="me-2" />,
             modalUrl: `/api/RemoveExConnector?TenantFilter=${tenant.defaultDomainName}&GUID=${row.Guid}&Type=${row.cippconnectortype}`,
-            modalMessage: 'Are you sure you want to disable this rule?',
+            modalMessage: 'Are you sure you want to delete this rule?',
           },
         ]}
         placement="end"
diff --git a/src/views/identity/administration/DeployJITAdmin.jsx b/src/views/identity/administration/DeployJITAdmin.jsx
index 81d23666fa61..146ab7d6fef1 100644
--- a/src/views/identity/administration/DeployJITAdmin.jsx
+++ b/src/views/identity/administration/DeployJITAdmin.jsx
@@ -47,10 +47,13 @@ const DeployJITAdmin = () => {
   const onSubmit = (values) => {
     const startTime = Math.floor(startDate.getTime() / 1000)
     const endTime = Math.floor(endDate.getTime() / 1000)
+
     const shippedValues = {
       TenantFilter: tenantDomain,
-      UserId: values.UserId?.value,
-      UserPrincipalName: `${values.username}@${values.domain}`,
+      UserId: values.UserId?.value.id,
+      UserPrincipalName: values.username
+        ? `${values.username}@${values.domain}`
+        : values.UserId?.value.userPrincipalName,
       FirstName: values.FirstName,
       LastName: values.LastName,
       useraction: values.useraction,
@@ -168,7 +171,7 @@ const DeployJITAdmin = () => {
                             <RFFSelectSearch
                               label={'Users in ' + tenantDomain}
                               values={users?.Results?.map((user) => ({
-                                value: user.id,
+                                value: { userPrincipalName: user.userPrincipalName, id: user.id },
                                 name: `${user.displayName} <${user.userPrincipalName}>`,
                               }))}
                               placeholder={!usersIsFetching ? 'Select user' : 'Loading...'}
diff --git a/src/views/teams-share/teams/BusinessVoice.jsx b/src/views/teams-share/teams/BusinessVoice.jsx
index 6c132806d8bf..5f2c0d32598a 100644
--- a/src/views/teams-share/teams/BusinessVoice.jsx
+++ b/src/views/teams-share/teams/BusinessVoice.jsx
@@ -1,68 +1,208 @@
-import React from 'react'
+import React, { useState } from 'react'
+import { CButton } from '@coreui/react'
 import { useSelector } from 'react-redux'
 import { CellBoolean } from 'src/components/tables'
 import { CippPageList } from 'src/components/layout'
-
-const Formatter = (cell) => CellBoolean({ cell })
-const columns = [
-  {
-    name: 'Assigned to User',
-    selector: (row) => row['AssignedTo'],
-    sortable: true,
-    exportSelector: 'AssignedTo',
-  },
-  {
-    name: 'Phone Number',
-    selector: (row) => row['TelephoneNumber'],
-    sortable: true,
-    exportSelector: 'TelephoneNumber',
-  },
-  {
-    name: 'Number Type',
-    selector: (row) => row['NumberType'],
-    sortable: true,
-    exportSelector: 'NumberType',
-  },
-  {
-    name: 'Country',
-    selector: (row) => row['IsoCountryCode'],
-    sortable: true,
-    exportSelector: 'IsCountryCode',
-  },
-  {
-    name: 'Location',
-    selector: (row) => row['PlaceName'],
-    sortable: true,
-    exportSelector: 'PlaceName',
-  },
-  {
-    name: 'Activation State',
-    selector: (row) => row['ActivationState'],
-    formatter: Formatter,
-    exportSelector: 'ActivationState',
-    sortable: true,
-  },
-  {
-    name: 'Operator Connect',
-    selector: (row) => row['IsOperatorConnect'],
-    formatter: Formatter,
-    sortable: true,
-    exportSelector: 'IsOperatorConnect',
-  },
-  {
-    name: 'Purchased on',
-    selector: (row) => row['AcquisitionDate'],
-    sortable: true,
-    exportSelector: 'AcquisitionDate',
-  },
-]
+import { TitleButton } from 'src/components/buttons'
+import { CippActionsOffcanvas } from 'src/components/utilities'
+import { faEllipsisV } from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 
 const BusinessVoice = () => {
   const tenant = useSelector((state) => state.app.currentTenant)
+  const Offcanvas = (row, rowIndex, formatExtraData) => {
+    const tenant = useSelector((state) => state.app.currentTenant)
+    const [ocVisible, setOCVisible] = useState(false)
+    return (
+      <>
+        <CButton size="sm" color="link" onClick={() => setOCVisible(true)}>
+          <FontAwesomeIcon icon={faEllipsisV} />
+        </CButton>
+        <CippActionsOffcanvas
+          title="Extended Information"
+          extendedInfo={[
+            {
+              label: 'Phone Number',
+              value: `${row.TelephoneNumber ?? ' '}`,
+            },
+            {
+              label: 'Licensed Usage',
+              value: `${usageFormatter(row.AcquiredCapabilities) ?? ' '}`,
+            },
+            {
+              label: 'Assignment Status',
+              value: `${row.AssignmentStatus ?? ' '}`,
+            },
+            {
+              label: 'Assigned to User',
+              value: `${row.AssignedTo ?? ' '}`,
+            },
+          ]}
+          actions={[
+            {
+              label: 'Assign User',
+              color: 'info',
+              modal: true,
+              modalType: 'POST',
+              modalBody: {
+                PhoneNumber: row.TelephoneNumber,
+                TenantFilter: tenant.defaultDomainName,
+                PhoneNumberType: row.NumberType,
+                locationOnly: false,
+              },
+              modalUrl: `/api/ExecTeamsVoicePhoneNumberAssignment`,
+              modalDropdown: {
+                url: `/api/listUsers?TenantFilter=${tenant.defaultDomainName}`,
+                labelField: 'displayName',
+                valueField: 'userPrincipalName',
+              },
+              modalMessage: 'Select the User to assign.',
+            },
+            {
+              label: 'Unassign User',
+              color: 'info',
+              modal: true,
+              modalType: 'POST',
+              modalBody: {
+                PhoneNumber: row.TelephoneNumber,
+                TenantFilter: tenant.defaultDomainName,
+                AssignedTo: row.AssignedTo,
+                PhoneNumberType: row.NumberType,
+              },
+              modalUrl: `/api/ExecRemoveTeamsVoicePhoneNumberAssignment`,
+              modalMessage: 'Are you sure you want to remove the assignment?',
+            },
+            {
+              label: 'Set Emergency Location',
+              color: 'info',
+              modal: true,
+              modalType: 'POST',
+              modalBody: {
+                PhoneNumber: row.TelephoneNumber,
+                TenantFilter: tenant.defaultDomainName,
+                locationOnly: true,
+              },
+              modalUrl: `/api/ExecTeamsVoicePhoneNumberAssignment`,
+              modalDropdown: {
+                url: `/api/ListTeamsLisLocation?TenantFilter=${tenant.defaultDomainName}`,
+                labelField: 'Description',
+                valueField: 'LocationId',
+              },
+              modalMessage: 'Select the Emergency Location.',
+            },
+          ]}
+          placement="end"
+          visible={ocVisible}
+          id={row.id}
+          hideFunction={() => setOCVisible(false)}
+        />
+      </>
+    )
+  }
+  const Formatter = (cell) => CellBoolean({ cell })
+  const usageFormatter = (cell) => {
+    if (cell.includes('UserAssignment')) {
+      return 'User'
+    }
+    if (cell.includes('FirstPartyAppAssignment')) {
+      return 'Voice App'
+    }
+    if (cell.includes('ConferenceAssignment')) {
+      return 'Conference'
+    }
+    return cell[0]
+  }
+  const columns = [
+    {
+      name: 'Assigned to User',
+      selector: (row) => row['AssignedTo'],
+      sortable: true,
+      exportSelector: 'AssignedTo',
+    },
+    {
+      name: 'Phone Number',
+      selector: (row) => row['TelephoneNumber'],
+      sortable: true,
+      exportSelector: 'TelephoneNumber',
+    },
+    {
+      name: 'Assignment Status',
+      selector: (row) => row['AssignmentStatus'],
+      sortable: true,
+      exportSelector: 'AssignmentStatus',
+    },
+    {
+      name: 'Number Type',
+      selector: (row) => row['NumberType'],
+      sortable: true,
+      exportSelector: 'NumberType',
+    },
+    {
+      name: 'Licensed Usage',
+      selector: (row) => usageFormatter(row['AcquiredCapabilities']),
+      sortable: true,
+      exportSelector: 'AcquiredCapabilities',
+    },
+    {
+      name: 'Country',
+      selector: (row) => row['IsoCountryCode'],
+      sortable: true,
+      exportSelector: 'IsCountryCode',
+    },
+    {
+      name: 'Location',
+      selector: (row) => row['PlaceName'],
+      sortable: true,
+      exportSelector: 'PlaceName',
+    },
+    {
+      name: 'Activation State',
+      selector: (row) => row['ActivationState'],
+      formatter: Formatter,
+      exportSelector: 'ActivationState',
+      sortable: true,
+    },
+    {
+      name: 'Operator Connect',
+      selector: (row) => row['IsOperatorConnect'],
+      formatter: Formatter,
+      sortable: true,
+      exportSelector: 'IsOperatorConnect',
+    },
+    {
+      name: 'Purchased on',
+      selector: (row) => row['AcquisitionDate'],
+      sortable: true,
+      exportSelector: 'AcquisitionDate',
+    },
+    {
+      name: 'Actions',
+      cell: Offcanvas,
+    },
+  ]
+  const titleButtons = (
+    <div style={{ display: 'flex', alignItems: 'right' }}>
+      <div style={{ marginLeft: '10px' }}>
+        <TitleButton
+          key="block-caller"
+          href="/teams-share/teams/business-voice-block-caller"
+          title="Block Caller"
+        />
+      </div>
+    </div>
+  )
   return (
     <CippPageList
       title="Teams Business Voice"
+      //titleButton={titleButtons}
       datatable={{
+        filterlist: [
+          {
+            filterName: 'Unassigned User Numbers',
+            filter:
+              'Complex: AssignmentStatus eq Unassigned; AcquiredCapabilities like UserAssignment',
+          },
+        ],
         columns,
         path: '/api/ListTeamsVoice',
         reportName: `${tenant?.defaultDomainName}-BusinessVoice`,
diff --git a/src/views/tenant/administration/AlertWizard.jsx b/src/views/tenant/administration/AlertWizard.jsx
index 9b5253ef7351..e444c11ec123 100644
--- a/src/views/tenant/administration/AlertWizard.jsx
+++ b/src/views/tenant/administration/AlertWizard.jsx
@@ -21,6 +21,7 @@ import auditLogSchema from 'src/data/AuditLogSchema.json'
 import auditLogTemplates from 'src/data/AuditLogTemplates.json'
 import Skeleton from 'react-loading-skeleton'
 import { required } from 'src/validators'
+import HtmlParser from 'react-html-parser'
 
 const AlertWizard = () => {
   const tenantDomain = useSelector((state) => state.app.currentTenant.defaultDomainName)
@@ -112,6 +113,18 @@ const AlertWizard = () => {
     }
   }
 
+  const getScriptDescription = () => {
+    const values = currentFormState?.values
+    if (values) {
+      const command = values.command?.value
+      if (command?.description) {
+        return HtmlParser(command.description)
+      } else {
+        return null
+      }
+    }
+  }
+
   const setAuditForm = (e) => {
     const preset = presetValues.find((p) => p.value === e.value)
     setAuditFormState(preset.template)
@@ -368,6 +381,16 @@ const AlertWizard = () => {
                       render={({ handleSubmit, submitting, values }) => {
                         return (
                           <CForm id="alertForm" onSubmit={handleSubmit}>
+                            {getScriptDescription() && (
+                              <CRow className="mb-3">
+                                <CCol>
+                                  <CCallout color="info">
+                                    <FontAwesomeIcon icon="info-circle" className="me-2" />
+                                    {getScriptDescription()}
+                                  </CCallout>
+                                </CCol>
+                              </CRow>
+                            )}
                             <CRow className="mb-3">
                               <CCol>
                                 <RFFSelectSearch
@@ -382,6 +405,7 @@ const AlertWizard = () => {
                                 />
                               </CCol>
                             </CRow>
+
                             <Condition when="command.value.requiresInput" is={true}>
                               <CRow className="mb-3">
                                 <CCol>