diff --git a/src/api/Metadata.js b/src/api/Metadata.js
index 80dd6bf61f..bf64ba62ea 100644
--- a/src/api/Metadata.js
+++ b/src/api/Metadata.js
@@ -128,7 +128,7 @@ class Metadata extends File {
     /**
      * Returns the custom properties template
      *
-     * @return {Object} temaplte for custom properties
+     * @return {Object} template for custom properties
      */
     getCustomPropertiesTemplate(): MetadataTemplate {
         return {
diff --git a/src/components/close-button/CloseButton.tsx b/src/components/close-button/CloseButton.tsx
index 0740cf5438..365fede283 100644
--- a/src/components/close-button/CloseButton.tsx
+++ b/src/components/close-button/CloseButton.tsx
@@ -1,22 +1,30 @@
 import * as React from 'react';
 import classNames from 'classnames';
 
+import { injectIntl, IntlShape } from 'react-intl';
+
 import Button, { ButtonType } from '../button';
 import IconClose from '../../icons/general/IconClose';
 import { bdlGray65 } from '../../styles/variables';
 
+// @ts-ignore flow import
+import messages from '../../common/messages';
+
 import './CloseButton.scss';
 
 export interface CloseButtonProps {
     /** Custom class for the close button */
     className?: string;
+    /** Intl object */
+    intl: IntlShape;
     /** onClick handler for the close button */
     onClick?: Function;
 }
 
-const CloseButton = ({ className, onClick }: CloseButtonProps) => {
+const CloseButton = ({ className, intl, onClick }: CloseButtonProps) => {
     return (
         <Button
+            aria-label={intl.formatMessage(messages.close)}
             className={classNames('bdl-CloseButton', className)}
             data-testid="bdl-CloseButton"
             onClick={onClick}
@@ -27,4 +35,4 @@ const CloseButton = ({ className, onClick }: CloseButtonProps) => {
     );
 };
 
-export default CloseButton;
+export default injectIntl(CloseButton);
diff --git a/src/components/close-button/__tests__/CloseButton.test.tsx b/src/components/close-button/__tests__/CloseButton.test.tsx
index a2be32ccb4..908ba32d42 100644
--- a/src/components/close-button/__tests__/CloseButton.test.tsx
+++ b/src/components/close-button/__tests__/CloseButton.test.tsx
@@ -23,6 +23,12 @@ describe('components/close-button/CloseButton', () => {
             expect(closeButton).toHaveClass(customClass);
             expect(closeButton).toHaveClass('bdl-CloseButton');
         });
+
+        test('should have an accessibility label', () => {
+            render(<CloseButton />);
+            const closeButton = screen.getByRole('button');
+            expect(closeButton).toHaveAttribute('aria-label');
+        });
     });
 
     describe('onClick()', () => {
diff --git a/src/components/modal/ModalDialog.js b/src/components/modal/ModalDialog.js
index ede5746fa1..d4223514ef 100644
--- a/src/components/modal/ModalDialog.js
+++ b/src/components/modal/ModalDialog.js
@@ -143,6 +143,7 @@ class ModalDialog extends React.Component<Props> {
         const divProps = omit(rest, ['children', 'closeButtonProps', 'onRequestClose', 'intl']);
 
         divProps.role = isAlertType ? 'alertdialog' : 'dialog';
+        divProps['aria-modal'] = true;
         divProps['aria-labelledby'] = `${this.modalID}-label`;
         if (isAlertType) {
             divProps['aria-describedby'] = `${this.modalID}-desc`;
diff --git a/src/components/modal/__tests__/ModalDialog.test.js b/src/components/modal/__tests__/ModalDialog.test.js
index 3b0028f778..14a0f39a56 100644
--- a/src/components/modal/__tests__/ModalDialog.test.js
+++ b/src/components/modal/__tests__/ModalDialog.test.js
@@ -37,6 +37,7 @@ describe('components/modal/ModalDialog', () => {
 
     test('should set aria props on modal dialog when rendered', () => {
         expect(wrapper.prop('role')).toEqual('dialog');
+        expect(wrapper.prop('aria-modal')).toEqual(true);
         expect(wrapper.prop('aria-labelledby')).toEqual(`${instance.modalID}-label`);
     });
 
diff --git a/test/explorer-no-react.html b/test/explorer-no-react.html
index bcd13c0e81..1b72e30b2f 100644
--- a/test/explorer-no-react.html
+++ b/test/explorer-no-react.html
@@ -33,7 +33,7 @@
                 display: flex;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/explorer.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/explorer.css" />
     </head>
     <body>
         <div class="inputs">
@@ -62,7 +62,7 @@ <h1>
         </div>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/react/17.0.1/umd/react.development.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/17.0.1/umd/react-dom.development.js"></script>
-        <script src="../dist/dev/en-US/explorer.no.react.js"></script>
+        <script src="../dev/en-US/explorer.no.react.js"></script>
         <script>
             function load() {
                 const { ContentExplorer } = Box;
diff --git a/test/explorer-picker-uploader.html b/test/explorer-picker-uploader.html
index 78035d0a77..4c70c556a3 100644
--- a/test/explorer-picker-uploader.html
+++ b/test/explorer-picker-uploader.html
@@ -32,9 +32,9 @@
                 display: flex;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/explorer.css" />
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/picker.css" />
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/uploader.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/explorer.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/picker.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/uploader.css" />
     </head>
     <body>
         <div class="inputs">
@@ -66,9 +66,9 @@ <h1>Folder Picker</h1>
             <h1>Content Uploader</h1>
             <div class="uploader1"></div>
         </div>
-        <script src="../dist/dev/en-US/explorer.js"></script>
-        <script src="../dist/dev/en-US/picker.js"></script>
-        <script src="../dist/dev/en-US/uploader.js"></script>
+        <script src="../dev/en-US/explorer.js"></script>
+        <script src="../dev/en-US/picker.js"></script>
+        <script src="../dev/en-US/uploader.js"></script>
         <script>
             function load() {
                 const { ContentExplorer, FolderPicker, FilePicker, ContentUploader } = Box;
diff --git a/test/explorer.html b/test/explorer.html
index 58ef02107c..7b61c858d0 100644
--- a/test/explorer.html
+++ b/test/explorer.html
@@ -46,7 +46,7 @@
                 vertical-align: middle;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/explorer.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/explorer.css" />
     </head>
     <body>
         <div class="inputs">
@@ -72,7 +72,7 @@ <h1>Content Explorer (no folder upload)</h1>
             <h1>Content Explorer (grid view)</h1>
             <div class="explorer4"></div>
         </div>
-        <script src="../dist/dev/en-US/explorer.js"></script>
+        <script src="../dev/en-US/explorer.js"></script>
         <script>
             function load() {
                 const { ContentExplorer } = Box;
diff --git a/test/openwith.html b/test/openwith.html
index c2bb4cbe17..abebcecc3e 100644
--- a/test/openwith.html
+++ b/test/openwith.html
@@ -25,9 +25,9 @@
                 margin: 20px;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/openwith.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/openwith.css" />
         <script src="https://cdn.polyfill.io/v2/polyfill.js?features=es6,Intl"></script>
-        <script src="../dist/dev/en-US/openwith.js"></script>
+        <script src="../dev/en-US/openwith.js"></script>
     </head>
     <body>
         <div class="container">
diff --git a/test/pickers-no-react.html b/test/pickers-no-react.html
index 5073d35ed9..a09d31be4e 100644
--- a/test/pickers-no-react.html
+++ b/test/pickers-no-react.html
@@ -37,7 +37,7 @@
                 display: flex;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/picker.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/picker.css" />
     </head>
     <body>
         <div class="inputs">
@@ -78,7 +78,7 @@ <h1>Folder Picker (max 3 items / token generator / cannot upload)</h1>
         </div>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/react/17.0.1/umd/react.development.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/17.0.1/umd/react-dom.development.js"></script>
-        <script src="../dist/dev/en-US/picker.no.react.js"></script>
+        <script src="../dev/en-US/picker.no.react.js"></script>
         <script>
             function load() {
                 const { FilePicker, FolderPicker } = Box;
diff --git a/test/pickers.html b/test/pickers.html
index eedaebc89f..7cf22a7f26 100644
--- a/test/pickers.html
+++ b/test/pickers.html
@@ -39,7 +39,7 @@
                 display: flex;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/picker.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/picker.css" />
     </head>
     <body>
         <div class="inputs">
@@ -82,7 +82,7 @@ <h1>
             <h1>Folder Picker (max 3 items / token generator / no upload)</h1>
             <div class="folderPicker2"></div>
         </div>
-        <script src="../dist/dev/en-US/picker.js"></script>
+        <script src="../dev/en-US/picker.js"></script>
         <script>
             function load() {
                 const { FilePicker, FolderPicker, ContentPicker } = Box;
diff --git a/test/popups.html b/test/popups.html
index 4f0d5c0afc..96f6bf167e 100644
--- a/test/popups.html
+++ b/test/popups.html
@@ -48,8 +48,8 @@
                 background: red;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/picker.css" />
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/uploader.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/picker.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/uploader.css" />
     </head>
     <body>
         <div class="inputs">
@@ -100,8 +100,8 @@ <h1>
             <h1>Folder Picker (max 3 items / token generator / no upload)</h1>
             <div class="folderPicker2"></div>
         </div>
-        <script src="../dist/dev/en-US/picker.js"></script>
-        <script src="../dist/dev/en-US/uploader.js"></script>
+        <script src="../dev/en-US/picker.js"></script>
+        <script src="../dev/en-US/uploader.js"></script>
         <script>
             function load() {
                 const { FilePicker, FolderPicker, ContentPicker, ContentUploader } = Box;
diff --git a/test/preview-react-with-sidebar.html b/test/preview-react-with-sidebar.html
index 85d732f4a6..7df77c488a 100644
--- a/test/preview-react-with-sidebar.html
+++ b/test/preview-react-with-sidebar.html
@@ -29,8 +29,8 @@
                 width: 100%;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/preview.css" />
-        <script src="../dist/dev/en-US/preview.js"></script>
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/preview.css" />
+        <script src="../dev/en-US/preview.js"></script>
     </head>
     <body>
         <div class="inputs">
diff --git a/test/preview-react.html b/test/preview-react.html
index fe7b54aad8..8508bde74e 100644
--- a/test/preview-react.html
+++ b/test/preview-react.html
@@ -30,8 +30,8 @@
                 width: 800px;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/preview.css" />
-        <script src="../dist/dev/en-US/preview.js"></script>
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/preview.css" />
+        <script src="../dev/en-US/preview.js"></script>
     </head>
     <body>
         <div class="inputs">
diff --git a/test/preview.html b/test/preview.html
index 09f71723e9..3357f101b6 100644
--- a/test/preview.html
+++ b/test/preview.html
@@ -33,8 +33,8 @@
                 flex-grow: 1;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/explorer.css" />
-        <script src="../dist/dev/en-US/explorer.js"></script>
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/explorer.css" />
+        <script src="../dev/en-US/explorer.js"></script>
     </head>
 
     <body>
diff --git a/test/pseudo.html b/test/pseudo.html
index bfe52dc146..6e67aa5e64 100644
--- a/test/pseudo.html
+++ b/test/pseudo.html
@@ -28,9 +28,9 @@
                 display: flex;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-x-pseudo/explorer.css" />
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-x-pseudo/picker.css" />
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-x-pseudo/uploader.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-x-pseudo/explorer.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-x-pseudo/picker.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-x-pseudo/uploader.css" />
     </head>
     <body>
         <div class="inputs">
diff --git a/test/sharing-no-react.html b/test/sharing-no-react.html
index 95126c4337..1fc66f33c6 100644
--- a/test/sharing-no-react.html
+++ b/test/sharing-no-react.html
@@ -17,12 +17,12 @@
             }
         </style>
 
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/sharing.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/sharing.css" />
         <script src="https://cdnjs.cloudflare.com/ajax/libs/react/17.0.1/umd/react.development.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/17.0.1/umd/react-dom.development.js"></script>
     </head>
     <body>
-        <script src="../dist/dev/en-US/sharing.no.react.js"></script>
+        <script src="../dev/en-US/sharing.no.react.js"></script>
 
         <div>
             <form class="inputs">
diff --git a/test/sharing.html b/test/sharing.html
index 163adf8d12..89bb98763b 100644
--- a/test/sharing.html
+++ b/test/sharing.html
@@ -17,10 +17,10 @@
             }
         </style>
 
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/sharing.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/sharing.css" />
     </head>
     <body>
-        <script src="../dist/dev/en-US/sharing.js"></script>
+        <script src="../dev/en-US/sharing.js"></script>
 
         <div>
             <form class="inputs">
diff --git a/test/sidebar-additional-tabs.html b/test/sidebar-additional-tabs.html
index 0efb21b630..578090db6b 100644
--- a/test/sidebar-additional-tabs.html
+++ b/test/sidebar-additional-tabs.html
@@ -29,9 +29,9 @@
                 margin-bottom: 10px;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/sidebar.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/sidebar.css" />
         <script src="https://unpkg.com/react/umd/react.development.js"></script>
-        <script src="../dist/dev/en-US/sidebar.js"></script>
+        <script src="../dev/en-US/sidebar.js"></script>
     </head>
     <body>
         <div class="sidebar">
diff --git a/test/sidebar.html b/test/sidebar.html
index 803da650cf..778cc8a3c8 100644
--- a/test/sidebar.html
+++ b/test/sidebar.html
@@ -51,8 +51,8 @@
                 <button type="button" onclick="load(true)">Submit</button>
             </div>
         </div>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/sidebar.css" />
-        <script src="../dist/dev/en-US/sidebar.js"></script>
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/sidebar.css" />
+        <script src="../dev/en-US/sidebar.js"></script>
     </head>
 
     <body>
diff --git a/test/uploader-no-react.html b/test/uploader-no-react.html
index 6d73c38147..bd33e6ecbb 100644
--- a/test/uploader-no-react.html
+++ b/test/uploader-no-react.html
@@ -34,7 +34,7 @@
                 display: flex;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/uploader.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/uploader.css" />
     </head>
 
     <body>
@@ -57,7 +57,7 @@ <h1>Content Uploader</h1>
         </div>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/react/17.0.1/umd/react.development.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/17.0.1/umd/react-dom.development.js"></script>
-        <script src="../dist/dev/en-US/uploader.no.react.js"></script>
+        <script src="../dev/en-US/uploader.no.react.js"></script>
         <script>
             // Set token and folder ID to locally stored values if available
             (function() {
diff --git a/test/uploader-window-view.html b/test/uploader-window-view.html
index adb0460350..22e0de1839 100644
--- a/test/uploader-window-view.html
+++ b/test/uploader-window-view.html
@@ -41,7 +41,7 @@
                 width: 100%;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/uploader.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/uploader.css" />
     </head>
 
     <body>
@@ -69,7 +69,7 @@ <h1>Upload Manager - Choose File to Upload</h1>
             <div class="drop-zone"><h2>Drop Files/Folders Here</h2></div>
             <div class="uploader1"></div>
         </div>
-        <script src="../dist/dev/en-US/uploader.js"></script>
+        <script src="../dev/en-US/uploader.js"></script>
         <script>
             let resetTimeout;
             // Set token and folder ID to locally stored values if available
diff --git a/test/uploader.html b/test/uploader.html
index 2b25f219d0..8e0ee26ce1 100644
--- a/test/uploader.html
+++ b/test/uploader.html
@@ -31,7 +31,7 @@
                 display: flex;
             }
         </style>
-        <link rel="stylesheet" type="text/css" href="../dist/dev/en-US/uploader.css" />
+        <link rel="stylesheet" type="text/css" href="../dev/en-US/uploader.css" />
     </head>
 
     <body>
@@ -56,7 +56,7 @@ <h1>Content Uploader</h1>
             </div>
             <div class="uploader1"></div>
         </div>
-        <script src="../dist/dev/en-US/uploader.js"></script>
+        <script src="../dev/en-US/uploader.js"></script>
         <script>
             // Set token and folder ID to locally stored values if available
             (function() {