diff --git a/frontend/src/component/common/ConstraintsList/ConstraintItemHeader/ConstraintItemHeader.tsx b/frontend/src/component/common/ConstraintsList/ConstraintItemHeader/ConstraintItemHeader.tsx
index 2c2798da91..888cc26929 100644
--- a/frontend/src/component/common/ConstraintsList/ConstraintItemHeader/ConstraintItemHeader.tsx
+++ b/frontend/src/component/common/ConstraintsList/ConstraintItemHeader/ConstraintItemHeader.tsx
@@ -112,14 +112,12 @@ export const ConstraintItemHeader: FC<ConstraintItemHeaderProps> = ({
                     ) : null}
                 </StyledOperatorGroup>
                 <div>
-                    <div>
-                        <ValuesList
-                            values={items}
-                            onSetTruncated={onSetTruncated}
-                            tooltips={tooltips}
-                        />
-                        {viewMore}
-                    </div>
+                    <ValuesList
+                        values={items}
+                        onSetTruncated={onSetTruncated}
+                        tooltips={tooltips}
+                    />
+                    {viewMore}
                 </div>
             </StyledConstraintContainer>
         </StrategyEvaluationItem>
diff --git a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx
index 2712952f06..e5c25bc733 100644
--- a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx
+++ b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionView.tsx
@@ -35,6 +35,7 @@ const StyledAccordion = styled(Accordion)(({ theme }) => ({
     '&:before': {
         opacity: '0',
     },
+    overflow: 'hidden',
 }));
 
 const StyledAccordionSummary = styled(AccordionSummary)(({ theme }) => ({
diff --git a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewHeader/ConstraintAccordionViewHeaderInfo.tsx b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewHeader/ConstraintAccordionViewHeaderInfo.tsx
index bb66cc4854..d733fd34ff 100644
--- a/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewHeader/ConstraintAccordionViewHeaderInfo.tsx
+++ b/frontend/src/component/common/NewConstraintAccordion/ConstraintAccordionView/ConstraintAccordionViewHeader/ConstraintAccordionViewHeaderInfo.tsx
@@ -20,7 +20,7 @@ const StyledHeaderMetaInfo = styled('div')(({ theme }) => ({
     },
 }));
 
-const StyledExpandItem = styled('div')(({ theme }) => ({
+const StyledExpandItem = styled('p')(({ theme }) => ({
     color: theme.palette.secondary.main,
     margin: theme.spacing(0.25, 0, 0, 0.75),
     fontSize: theme.fontSizes.smallerBody,
diff --git a/frontend/src/component/common/SegmentItem/SegmentItem.tsx b/frontend/src/component/common/SegmentItem/SegmentItem.tsx
index a1844be478..02438f6a13 100644
--- a/frontend/src/component/common/SegmentItem/SegmentItem.tsx
+++ b/frontend/src/component/common/SegmentItem/SegmentItem.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState, type FC } from 'react';
+import { useId, useMemo, useState, type FC } from 'react';
 import { Link } from 'react-router-dom';
 import type { ISegment } from 'interfaces/segment';
 import {
@@ -41,6 +41,9 @@ const StyledAccordion = styled(Accordion)(() => ({
 const StyledAccordionSummary = styled(AccordionSummary)(({ theme }) => ({
     fontSize: theme.typography.body2.fontSize,
     minHeight: 'unset',
+    ':focus-within': {
+        backgroundColor: 'inherit',
+    },
 }));
 
 const StyledAccordionDetails = styled(AccordionDetails)(({ theme }) => ({
@@ -77,6 +80,7 @@ export const SegmentItem: FC<SegmentItemProps> = ({
     constraintList,
 }) => {
     const [isOpen, setIsOpen] = useState(isExpanded || false);
+    const segmentDetailsId = useId();
 
     const constraints = useMemo(() => {
         if (constraintList) {
@@ -110,7 +114,11 @@ export const SegmentItem: FC<SegmentItemProps> = ({
                 disableGutters
                 TransitionProps={{ mountOnEnter: true, unmountOnExit: true }}
             >
-                <StyledAccordionSummary id={`segment-accordion-${segment.id}`}>
+                <StyledAccordionSummary
+                    id={`segment-accordion-${segment.id}`}
+                    tabIndex={-1}
+                    aria-controls={segmentDetailsId}
+                >
                     <StrategyEvaluationItem type='Segment'>
                         <StyledLink to={`/segments/edit/${segment.id}`}>
                             {segment.name}
@@ -120,6 +128,7 @@ export const SegmentItem: FC<SegmentItemProps> = ({
                     {!isExpanded ? (
                         <StyledActionsContainer>
                             <StyledButton
+                                aria-controls={segmentDetailsId}
                                 size='small'
                                 variant='outlined'
                                 onClick={() => setIsOpen((value) => !value)}