diff --git a/govtool/backend/sql/get-network-metrics.sql b/govtool/backend/sql/get-network-metrics.sql
index 73ddabc95..651f28a6d 100644
--- a/govtool/backend/sql/get-network-metrics.sql
+++ b/govtool/backend/sql/get-network-metrics.sql
@@ -22,21 +22,18 @@ CurrentEpoch AS (
     SELECT MAX(no) AS no FROM epoch
 ),
 CommitteeMembers AS (
-    SELECT DISTINCT ON (cm.committee_hash_id)
-        cr.id,
-        block.time,
-        encode(cold_key_hash.raw, 'hex') cold_key,
-        encode(hot_key_hash.raw, 'hex') hot_key
-    FROM committee_registration cr
-    JOIN tx ON tx.id = cr.tx_id
-    JOIN block ON block.id = tx.block_id
-    JOIN committee_hash cold_key_hash ON cr.cold_key_id = cold_key_hash.id
-    JOIN committee_hash hot_key_hash ON cr.hot_key_id = hot_key_hash.id
-    JOIN committee_member cm ON cm.committee_hash_id = cold_key_hash.id OR cm.committee_hash_id = hot_key_hash.id
-    LEFT JOIN committee_de_registration cdr ON cdr.cold_key_id = cold_key_hash.id
-    CROSS JOIN CurrentEpoch
-    WHERE
-        cdr.id IS NULL AND cm.expiration_epoch > CurrentEpoch.no 
+    SELECT
+        DISTINCT cm.committee_hash_id AS committee_members
+    FROM committee_member cm
+        JOIN committee c ON c.id = cm.committee_id
+        LEFT JOIN gov_action_proposal gap ON gap.id = c.gov_action_proposal_id
+        CROSS JOIN CurrentEpoch ce
+    WHERE (
+        (c.gov_action_proposal_id IS NULL)
+       OR
+        (gap.enacted_epoch IS NOT NULL AND gap.enacted_epoch <= ce.no)
+        )
+      AND cm.expiration_epoch >= ce.no
 ),
 NoOfCommitteeMembers AS (
 	SELECT COUNT(*) total FROM CommitteeMembers
diff --git a/govtool/frontend/package-lock.json b/govtool/frontend/package-lock.json
index aa7470bca..4b6e6afcc 100644
--- a/govtool/frontend/package-lock.json
+++ b/govtool/frontend/package-lock.json
@@ -15,7 +15,7 @@
         "@hookform/resolvers": "^3.3.1",
         "@intersect.mbo/govtool-outcomes-pillar-ui": "v1.5.9",
         "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
-        "@intersect.mbo/pdf-ui": "1.0.14-beta",
+        "@intersect.mbo/pdf-ui": "1.0.15-beta",
         "@mui/icons-material": "^5.14.3",
         "@mui/material": "^5.14.4",
         "@noble/ed25519": "^2.3.0",
@@ -3426,9 +3426,9 @@
       "license": "ISC"
     },
     "node_modules/@intersect.mbo/pdf-ui": {
-      "version": "1.0.14-beta",
-      "resolved": "https://registry.npmjs.org/@intersect.mbo/pdf-ui/-/pdf-ui-1.0.14-beta.tgz",
-      "integrity": "sha512-d+soKsSE6xbNAmjqjZfs1HEsYLJeE9UTlM91kpMtujEeTTZDyg+EwbyjZ5a1ZpRZCD0D7j6tg69muSHxrz6BLg==",
+      "version": "1.0.15-beta",
+      "resolved": "https://registry.npmjs.org/@intersect.mbo/pdf-ui/-/pdf-ui-1.0.15-beta.tgz",
+      "integrity": "sha512-Yzve799kMvCA5/9k3yyUmOyOAkpQuro9wo7PiF3Ham9QYjTuygb9QXEbeyCM0d5ofTePmnMKEqiFZ4x9AmTuIg==",
       "dependencies": {
         "@emurgo/cardano-serialization-lib-asmjs": "^12.0.0-beta.2",
         "@fontsource/poppins": "^5.0.14",
diff --git a/govtool/frontend/package.json b/govtool/frontend/package.json
index 578e6c801..a23ab3685 100644
--- a/govtool/frontend/package.json
+++ b/govtool/frontend/package.json
@@ -29,7 +29,7 @@
     "@hookform/resolvers": "^3.3.1",
     "@intersect.mbo/govtool-outcomes-pillar-ui": "v1.5.9",
     "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
-    "@intersect.mbo/pdf-ui": "1.0.14-beta",
+    "@intersect.mbo/pdf-ui": "1.0.15-beta",
     "@mui/icons-material": "^5.14.3",
     "@mui/material": "^5.14.4",
     "@noble/ed25519": "^2.3.0",
diff --git a/govtool/frontend/src/components/molecules/DataActionsBar.tsx b/govtool/frontend/src/components/molecules/DataActionsBar.tsx
index b6672a968..88790149d 100644
--- a/govtool/frontend/src/components/molecules/DataActionsBar.tsx
+++ b/govtool/frontend/src/components/molecules/DataActionsBar.tsx
@@ -74,14 +74,16 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({
     setChosenFilters?.((prev) => (prev ?? []).filter((k) => k !== key));
 
   return (
-    <Box display="flex" flexDirection="column" gap={1.5}>
+    <Box display="flex" flexDirection="column" gap={1.5} sx={{ width: "100%" }}>
       <Box
+        display="grid"
+        gridTemplateColumns={{
+          xs: "minmax(0,1fr) max-content",
+          sm: "minmax(0,1fr) max-content",
+        }}
+        columnGap={{ xs: 1, sm: 1.5 }}
         alignItems="center"
-        display="flex"
-        justifyContent="space-between"
-        gap={{ xs: 0.75, sm: 1.5 }}
-        flexWrap={{ xs: "wrap", sm: "nowrap" }}
-        width="100%"
+        sx={{ width: "100%" }}
       >
         <InputBase
           inputProps={{ "data-testid": "search-input" }}
@@ -115,7 +117,7 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({
             borderColor: "#6E87D9",
             borderRadius: 50,
             boxShadow: "2px 2px 20px 0 rgba(0,0,0,0.05)",
-            fontSize: 11,
+            fontSize: { xs: 16, sm: 11 },
             fontWeight: 500,
             height: 48,
             padding: "16px 24px",
@@ -133,6 +135,7 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({
             flex: "0 0 auto",
             flexShrink: 0,
             mt: { xs: 1, sm: 0 },
+            mr: { xs: 2, sm: 0 },
           }}
         >
           <OrderActionsChip
diff --git a/govtool/frontend/src/pages/DRepDirectoryContent.tsx b/govtool/frontend/src/pages/DRepDirectoryContent.tsx
index d66588127..4ba2aa9be 100644
--- a/govtool/frontend/src/pages/DRepDirectoryContent.tsx
+++ b/govtool/frontend/src/pages/DRepDirectoryContent.tsx
@@ -69,7 +69,6 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
   const [inProgressDelegationDRepData, setInProgressDelegationDRepData] =
     useState<DRepData | undefined>(undefined);
 
-  // Set initial filters and sort
   useEffect(() => {
     if (!lastPath.includes("drep_directory")) {
       setChosenFilters([DRepStatus.Active]);
@@ -104,7 +103,7 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
     baselineTotalForStatus,
   } = useGetDRepListPaginatedQuery(
     {
-      page: page - 1, // convert 1-based UI -> 0-based API
+      page: page - 1,
       pageSize,
       searchPhrase: debouncedSearchText,
       sorting: chosenSorting as DRepListSort,
@@ -152,8 +151,13 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
         AutomatedVotingOptionCurrentDelegation.drep_always_no_confidence);
 
   return (
-    <Box display="flex" flex={1} flexDirection="column" gap={4}>
-      {/* My delegation */}
+    <Box
+      display="flex"
+      flex={1}
+      flexDirection="column"
+      gap={4}
+      sx={{ width: "100%", maxWidth: "100vw", overflowX: "hidden" }}
+    >
       {myDrep &&
         !inProgressDelegation &&
         currentDelegation &&
@@ -162,61 +166,65 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
             <Typography variant="title2" sx={{ mb: 2 }}>
               <Trans i18nKey="dRepDirectory.myDelegation" values={{ ada }} />
             </Typography>
-            <DRepCard
-              dRep={myDrep}
-              isConnected={!!isConnected}
-              isInProgress={isSameDRep(myDrep, inProgressDelegation)}
-              isMe={isSameDRep(myDrep, myDRepId)}
-            />
+            <Box sx={{ width: "100%" }}>
+              <DRepCard
+                dRep={myDrep}
+                isConnected={!!isConnected}
+                isInProgress={isSameDRep(myDrep, inProgressDelegation)}
+                isMe={isSameDRep(myDrep, myDRepId)}
+              />
+            </Box>
           </div>
         )}
       {inProgressDelegation &&
         inProgressDelegation !== myDRepId &&
         inProgressDelegationDRepData && (
-          <DRepCard
-            dRep={inProgressDelegationDRepData}
-            isConnected={!!isConnected}
-            isMe={isSameDRep(inProgressDelegationDRepData, myDRepId)}
-            isInProgress
-          />
+          <Box sx={{ width: "100%" }}>
+            <DRepCard
+              dRep={inProgressDelegationDRepData}
+              isConnected={!!isConnected}
+              isMe={isSameDRep(inProgressDelegationDRepData, myDRepId)}
+              isInProgress
+            />
+          </Box>
         )}
 
-      {/* Automated voting options */}
       {isConnected && (
         <div>
           <Typography variant="title2" sx={{ mb: 2 }}>
             {t("dRepDirectory.delegationOptions")}
           </Typography>
-          <AutomatedVotingOptions
-            currentDelegation={
-              !pendingTransaction.delegate && isAnAutomatedVotingOptionChosen
-                ? currentDelegation?.dRepView
-                : undefined
-            }
-            delegate={delegate}
-            delegationInProgress={
-              inProgressDelegation &&
-              (inProgressDelegation ===
-                AutomatedVotingOptionDelegationId.abstain ||
-                inProgressDelegation ===
-                  AutomatedVotingOptionDelegationId.no_confidence)
-                ? inProgressDelegation
-                : undefined
-            }
-            isConnected={!!isConnected}
-            isDelegationLoading={isDelegating}
-            votingPower={ada.toString()}
-            pendingTransaction={pendingTransaction}
-            txHash={
-              !pendingTransaction.delegate && isAnAutomatedVotingOptionChosen
-                ? currentDelegation?.txHash
-                : undefined
-            }
-          />
+          <Box sx={{ width: "100%" }}>
+            <AutomatedVotingOptions
+              currentDelegation={
+                !pendingTransaction.delegate && isAnAutomatedVotingOptionChosen
+                  ? currentDelegation?.dRepView
+                  : undefined
+              }
+              delegate={delegate}
+              delegationInProgress={
+                inProgressDelegation &&
+                (inProgressDelegation ===
+                  AutomatedVotingOptionDelegationId.abstain ||
+                  inProgressDelegation ===
+                    AutomatedVotingOptionDelegationId.no_confidence)
+                  ? inProgressDelegation
+                  : undefined
+              }
+              isConnected={!!isConnected}
+              isDelegationLoading={isDelegating}
+              votingPower={ada.toString()}
+              pendingTransaction={pendingTransaction}
+              txHash={
+                !pendingTransaction.delegate && isAnAutomatedVotingOptionChosen
+                  ? currentDelegation?.txHash
+                  : undefined
+              }
+            />
+          </Box>
         </div>
       )}
 
-      {/* DRep list */}
       <>
         <Typography fontSize={18} fontWeight={500} sx={{ mb: 3 }}>
           {t("dRepDirectory.listTitle")}
@@ -266,11 +274,31 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
             opacity: isPrev ? 0.5 : 1,
             transition: "opacity 0.2s",
             flex: 1,
+            width: "100%",
+            maxWidth: "100%",
+            overflowX: "hidden",
           }}
         >
           {filteredDoNotListDReps?.length === 0 && <EmptyStateDrepDirectory />}
           {filteredDoNotListDReps?.map((dRep) => (
-            <Box key={dRep.view} component="li" sx={{ listStyle: "none" }}>
+            <Box
+              key={dRep.view}
+              component="li"
+              sx={{
+                listStyle: "none",
+                width: "100%",
+                maxWidth: "100%",
+                "& .MuiCard-root, & .MuiPaper-root": {
+                  width: "100% !important",
+                  maxWidth: "100% !important",
+                  marginLeft: "0 !important",
+                  marginRight: "0 !important",
+                },
+                "& .MuiCardContent-root, & .MuiCardActions-root": {
+                  minWidth: 0,
+                },
+              }}
+            >
               <DRepCard
                 dRep={dRep}
                 isConnected={!!isConnected}
@@ -288,16 +316,18 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
           ))}
         </Box>
 
-        <PaginationFooter
-          page={page}
-          total={total || 0}
-          pageSize={pageSize}
-          onPageChange={setPage}
-          onPageSizeChange={(n) => {
-            setPageSize(n);
-            setPage(1);
-          }}
-        />
+        <Box sx={{ width: "100%", maxWidth: "100%", overflowX: "hidden" }}>
+          <PaginationFooter
+            page={page}
+            total={total || 0}
+            pageSize={pageSize}
+            onPageChange={setPage}
+            onPageSizeChange={(n) => {
+              setPageSize(n);
+              setPage(1);
+            }}
+          />
+        </Box>
       </>
     </Box>
   );
diff --git a/govtool/frontend/src/utils/validateSignature.ts b/govtool/frontend/src/utils/validateSignature.ts
index b39d274ea..cd6e7d2a8 100644
--- a/govtool/frontend/src/utils/validateSignature.ts
+++ b/govtool/frontend/src/utils/validateSignature.ts
@@ -24,11 +24,11 @@ export const validateSignature = async ({
     switch (algorithm) {
       case "ed25519":
       case "Ed25519": {
-        return verifyEd25519Signature(signature, messageHash, publicKey);
+        return await verifyEd25519Signature(signature, messageHash, publicKey);
       }
       case "CIP-8":
       case "CIP-0008": {
-        return verifyCIP8Signature(signature, messageHash, publicKey);
+        return await verifyCIP8Signature(signature, messageHash, publicKey);
       }
       default:
         console.error("Unsupported algorithm:", algorithm);