diff --git a/frontend/src/component/common/select.tsx b/frontend/src/component/common/select.tsx
index 6e8c89d291..fa429ea696 100644
--- a/frontend/src/component/common/select.tsx
+++ b/frontend/src/component/common/select.tsx
@@ -49,9 +49,7 @@ const SelectMenu: React.FC<ISelectMenuProps> = ({
 
     return (
         <FormControl variant="outlined" size="small" classes={classes}>
-            <InputLabel htmlFor={id} id={id}>
-                {label}
-            </InputLabel>
+            <InputLabel htmlFor={id}>{label}</InputLabel>
             <Select
                 name={name}
                 disabled={disabled}
diff --git a/frontend/src/component/feature/FeatureForm/FeatureForm.tsx b/frontend/src/component/feature/FeatureForm/FeatureForm.tsx
index dd5d8dfcb0..12bcb32fb8 100644
--- a/frontend/src/component/feature/FeatureForm/FeatureForm.tsx
+++ b/frontend/src/component/feature/FeatureForm/FeatureForm.tsx
@@ -79,6 +79,7 @@ const FeatureForm: React.FC<IFeatureToggleForm> = ({
                     disabled={mode === 'Edit'}
                     className={styles.input}
                     label="Name"
+                    id="feature-toggle-name"
                     error={Boolean(errors.name)}
                     errorText={errors.name}
                     onFocus={() => clearErrors()}
@@ -141,6 +142,7 @@ const FeatureForm: React.FC<IFeatureToggleForm> = ({
                         variant="subtitle1"
                         className={styles.roleSubtitle}
                         data-loading
+                        component="h2"
                     >
                         Impression Data
                     </Typography>
diff --git a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx
index a49f9edddb..fbbd292d90 100644
--- a/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx
+++ b/frontend/src/component/feature/FeatureToggleListNew/FeatureToggleListNewItem/FeatureToggleListNewItem.tsx
@@ -132,6 +132,7 @@ const FeatureToggleListNewItem = ({
                                     environmentId={env.name}
                                     projectId={projectId}
                                     permission={UPDATE_FEATURE_ENVIRONMENT}
+                                    inputProps={{ 'aria-label': env.name }}
                                     ref={ref}
                                     onClick={() => {
                                         handleToggle(env);
diff --git a/frontend/src/component/feature/StrategyTypes/FlexibleStrategy/FlexibleStrategy.tsx b/frontend/src/component/feature/StrategyTypes/FlexibleStrategy/FlexibleStrategy.tsx
index 82338d7b09..8c8545ab90 100644
--- a/frontend/src/component/feature/StrategyTypes/FlexibleStrategy/FlexibleStrategy.tsx
+++ b/frontend/src/component/feature/StrategyTypes/FlexibleStrategy/FlexibleStrategy.tsx
@@ -85,6 +85,7 @@ const FlexibleStrategy = ({
                         display: 'flex',
                         alignItems: 'center',
                     }}
+                    component="h2"
                 >
                     Stickiness
                     <Tooltip title="Stickiness defines what parameter should be used to ensure that your users get consistency in features. By default unleash will use the first value present in the context in the order of userId, sessionId and random.">
@@ -119,6 +120,7 @@ const FlexibleStrategy = ({
                         display: 'flex',
                         alignItems: 'center',
                     }}
+                    component="h2"
                 >
                     GroupId
                     <Tooltip title="GroupId is used to ensure that different toggles will hash differently for the same user. The groupId defaults to feature toggle name, but you can override it to correlate rollout of multiple feature toggles.">
@@ -133,6 +135,7 @@ const FlexibleStrategy = ({
                 </Typography>
                 <Input
                     label="groupId"
+                    id="groupId-input"
                     value={groupId || ''}
                     disabled={!editable}
                     onChange={e => onUpdate('groupId')(e, e.target.value)}
diff --git a/frontend/src/component/feature/StrategyTypes/RolloutSlider/RolloutSlider.tsx b/frontend/src/component/feature/StrategyTypes/RolloutSlider/RolloutSlider.tsx
index b02cb5aa21..5c87cc096d 100644
--- a/frontend/src/component/feature/StrategyTypes/RolloutSlider/RolloutSlider.tsx
+++ b/frontend/src/component/feature/StrategyTypes/RolloutSlider/RolloutSlider.tsx
@@ -90,6 +90,7 @@ const RolloutSlider = ({
                 id="discrete-slider-always"
                 variant="subtitle2"
                 gutterBottom
+                component="h2"
             >
                 {name}
             </Typography>
diff --git a/frontend/src/component/feature/StrategyTypes/StrategyInputList/StrategyInputList.tsx b/frontend/src/component/feature/StrategyTypes/StrategyInputList/StrategyInputList.tsx
index 724736a12f..52fd2fc1d8 100644
--- a/frontend/src/component/feature/StrategyTypes/StrategyInputList/StrategyInputList.tsx
+++ b/frontend/src/component/feature/StrategyTypes/StrategyInputList/StrategyInputList.tsx
@@ -67,7 +67,9 @@ const StrategyInputList = ({
 
     return (
         <div>
-            <Typography variant="subtitle2">List of {name}</Typography>
+            <Typography variant="subtitle2" component="h2">
+                List of {name}
+            </Typography>
             <div
                 style={{
                     display: 'flex',
@@ -93,6 +95,7 @@ const StrategyInputList = ({
                             name={`input_field`}
                             variant="outlined"
                             label="Add items"
+                            id="input-add-items"
                             value={input}
                             size="small"
                             placeholder=""
diff --git a/frontend/src/component/history/EventLog/EventCard/EventDiff/EventDiff.jsx b/frontend/src/component/history/EventLog/EventCard/EventDiff/EventDiff.jsx
index 3b3f123972..15dcb714a3 100644
--- a/frontend/src/component/history/EventLog/EventCard/EventDiff/EventDiff.jsx
+++ b/frontend/src/component/history/EventLog/EventCard/EventDiff/EventDiff.jsx
@@ -94,7 +94,7 @@ const EventDiff = ({ entry }) => {
     }
 
     return (
-        <pre style={{ overflowX: 'auto', overflowY: 'hidden' }}>
+        <pre style={{ overflowX: 'auto', overflowY: 'hidden' }} tabIndex={0}>
             <code className="smalltext man">
                 {changes.length === 0 ? '(no changes)' : changes}
             </code>
diff --git a/frontend/src/component/history/EventLog/EventJson/EventJson.jsx b/frontend/src/component/history/EventLog/EventJson/EventJson.jsx
index 95c816d699..27b40b57b8 100644
--- a/frontend/src/component/history/EventLog/EventJson/EventJson.jsx
+++ b/frontend/src/component/history/EventLog/EventJson/EventJson.jsx
@@ -13,11 +13,11 @@ const EventJson = ({ entry }) => {
     const prettyPrinted = JSON.stringify(localEventData, null, 2);
 
     return (
-        <div className={styles.historyItem}>
+        <li className={styles.historyItem}>
             <div>
                 <code className="JSON smalltext man">{prettyPrinted}</code>
             </div>
-        </div>
+        </li>
     );
 };
 
diff --git a/frontend/src/component/history/EventLog/EventLog.jsx b/frontend/src/component/history/EventLog/EventLog.jsx
index 89d7e15ce2..cd2cc30d0a 100644
--- a/frontend/src/component/history/EventLog/EventLog.jsx
+++ b/frontend/src/component/history/EventLog/EventLog.jsx
@@ -30,12 +30,12 @@ const EventLog = ({
     let entries;
 
     const renderListItemCards = entry => (
-        <div key={entry.id} className={styles.eventEntry}>
+        <li key={entry.id} className={styles.eventEntry}>
             <EventCard
                 entry={entry}
                 timeFormatted={formatFulldateTime(entry.createdAt)}
             />
-        </div>
+        </li>
     );
 
     if (eventSettings.showData) {