diff --git a/packages/core/src/ui/components/ConfirmDRepRegistration/ConfirmDRepRegistration.stories.tsx b/packages/core/src/ui/components/ConfirmDRepRegistration/ConfirmDRepRegistration.stories.tsx
index fd42d09034..94e3848d44 100644
--- a/packages/core/src/ui/components/ConfirmDRepRegistration/ConfirmDRepRegistration.stories.tsx
+++ b/packages/core/src/ui/components/ConfirmDRepRegistration/ConfirmDRepRegistration.stories.tsx
@@ -3,11 +3,25 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { ConfirmDRepRegistration } from './ConfirmDRepRegistration';
 import { ComponentProps } from 'react';
 
+const customViewports = {
+  popup: {
+    name: 'Popup',
+    styles: {
+      width: '360px',
+      height: '600'
+    }
+  }
+};
+
 const meta: Meta<typeof ConfirmDRepRegistration> = {
-  title: 'ConfirmDRepRegistration',
+  title: 'Sanchonet/Certificates/ConfirmDRepRegistration',
   component: ConfirmDRepRegistration,
   parameters: {
-    layout: 'centered'
+    layout: 'centered',
+    viewport: {
+      viewports: customViewports,
+      defaultViewport: 'popup'
+    }
   }
 };
 
diff --git a/packages/core/src/ui/components/ConfirmDRepRetirement/ConfirmDRepRetirement.stories.tsx b/packages/core/src/ui/components/ConfirmDRepRetirement/ConfirmDRepRetirement.stories.tsx
index 1bf53abd47..594a6fcc5f 100644
--- a/packages/core/src/ui/components/ConfirmDRepRetirement/ConfirmDRepRetirement.stories.tsx
+++ b/packages/core/src/ui/components/ConfirmDRepRetirement/ConfirmDRepRetirement.stories.tsx
@@ -3,11 +3,25 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { ConfirmDRepRetirement } from './ConfirmDRepRetirement';
 import { ComponentProps } from 'react';
 
+const customViewports = {
+  popup: {
+    name: 'Popup',
+    styles: {
+      width: '360px',
+      height: '600'
+    }
+  }
+};
+
 const meta: Meta<typeof ConfirmDRepRetirement> = {
-  title: 'ConfirmDRepRetirement',
+  title: 'Sanchonet/Certificates/ConfirmDRepRetirement',
   component: ConfirmDRepRetirement,
   parameters: {
-    layout: 'centered'
+    layout: 'centered',
+    viewport: {
+      viewports: customViewports,
+      defaultViewport: 'popup'
+    }
   }
 };
 
diff --git a/packages/core/src/ui/components/ConfirmDRepUpdate/ConfirmDRepUpdate.stories.tsx b/packages/core/src/ui/components/ConfirmDRepUpdate/ConfirmDRepUpdate.stories.tsx
index c24658cdea..5a72d541f7 100644
--- a/packages/core/src/ui/components/ConfirmDRepUpdate/ConfirmDRepUpdate.stories.tsx
+++ b/packages/core/src/ui/components/ConfirmDRepUpdate/ConfirmDRepUpdate.stories.tsx
@@ -3,11 +3,25 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { ConfirmDRepUpdate } from './ConfirmDRepUpdate';
 import { ComponentProps } from 'react';
 
+const customViewports = {
+  popup: {
+    name: 'Popup',
+    styles: {
+      width: '360px',
+      height: '600'
+    }
+  }
+};
+
 const meta: Meta<typeof ConfirmDRepUpdate> = {
-  title: 'ConfirmDRepUpdate',
+  title: 'Sanchonet/Certificates/ConfirmDRepUpdate',
   component: ConfirmDRepUpdate,
   parameters: {
-    layout: 'centered'
+    layout: 'centered',
+    viewport: {
+      viewports: customViewports,
+      defaultViewport: 'popup'
+    }
   }
 };
 
diff --git a/packages/core/src/ui/components/ConfirmStakeRegistrationDelegation/ConfirmStakeRegistrationDelegation.stories.tsx b/packages/core/src/ui/components/ConfirmStakeRegistrationDelegation/ConfirmStakeRegistrationDelegation.stories.tsx
index 1cc3a0c203..68e9b704b6 100644
--- a/packages/core/src/ui/components/ConfirmStakeRegistrationDelegation/ConfirmStakeRegistrationDelegation.stories.tsx
+++ b/packages/core/src/ui/components/ConfirmStakeRegistrationDelegation/ConfirmStakeRegistrationDelegation.stories.tsx
@@ -3,11 +3,25 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { ConfirmStakeRegistrationDelegation } from './ConfirmStakeRegistrationDelegation';
 import { ComponentProps } from 'react';
 
+const customViewports = {
+  popup: {
+    name: 'Popup',
+    styles: {
+      width: '360px',
+      height: '600'
+    }
+  }
+};
+
 const meta: Meta<typeof ConfirmStakeRegistrationDelegation> = {
-  title: 'ConfirmStakeRegistrationDelegation',
+  title: 'Sanchonet/Certificates/ConfirmStakeRegistrationDelegation',
   component: ConfirmStakeRegistrationDelegation,
   parameters: {
-    layout: 'centered'
+    layout: 'centered',
+    viewport: {
+      viewports: customViewports,
+      defaultViewport: 'popup'
+    }
   }
 };
 
diff --git a/packages/core/src/ui/components/ConfirmStakeVoteDelegation/ConfirmStakeVoteDelegation.stories.tsx b/packages/core/src/ui/components/ConfirmStakeVoteDelegation/ConfirmStakeVoteDelegation.stories.tsx
index e96651dcd3..c044156a49 100644
--- a/packages/core/src/ui/components/ConfirmStakeVoteDelegation/ConfirmStakeVoteDelegation.stories.tsx
+++ b/packages/core/src/ui/components/ConfirmStakeVoteDelegation/ConfirmStakeVoteDelegation.stories.tsx
@@ -3,11 +3,25 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { ConfirmStakeVoteDelegation } from './ConfirmStakeVoteDelegation';
 import { ComponentProps } from 'react';
 
+const customViewports = {
+  popup: {
+    name: 'Popup',
+    styles: {
+      width: '360px',
+      height: '600'
+    }
+  }
+};
+
 const meta: Meta<typeof ConfirmStakeVoteDelegation> = {
-  title: 'ConfirmStakeVoteDelegation',
+  title: 'Sanchonet/Certificates/ConfirmStakeVoteDelegation',
   component: ConfirmStakeVoteDelegation,
   parameters: {
-    layout: 'centered'
+    layout: 'centered',
+    viewport: {
+      viewports: customViewports,
+      defaultViewport: 'popup'
+    }
   }
 };
 
diff --git a/packages/core/src/ui/components/ConfirmStakeVoteRegistrationDelegation/ConfirmStakeVoteRegistrationDelegation.stories.tsx b/packages/core/src/ui/components/ConfirmStakeVoteRegistrationDelegation/ConfirmStakeVoteRegistrationDelegation.stories.tsx
index 3a0b6b7ec0..c5f8e313bb 100644
--- a/packages/core/src/ui/components/ConfirmStakeVoteRegistrationDelegation/ConfirmStakeVoteRegistrationDelegation.stories.tsx
+++ b/packages/core/src/ui/components/ConfirmStakeVoteRegistrationDelegation/ConfirmStakeVoteRegistrationDelegation.stories.tsx
@@ -3,11 +3,25 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { ConfirmStakeVoteRegistrationDelegation } from './ConfirmStakeVoteRegistrationDelegation';
 import { ComponentProps } from 'react';
 
+const customViewports = {
+  popup: {
+    name: 'Popup',
+    styles: {
+      width: '360px',
+      height: '600'
+    }
+  }
+};
+
 const meta: Meta<typeof ConfirmStakeVoteRegistrationDelegation> = {
-  title: 'ConfirmStakeVoteRegistrationDelegation',
+  title: 'Sanchonet/Certificates/ConfirmStakeVoteRegistrationDelegation',
   component: ConfirmStakeVoteRegistrationDelegation,
   parameters: {
-    layout: 'centered'
+    layout: 'centered',
+    viewport: {
+      viewports: customViewports,
+      defaultViewport: 'popup'
+    }
   }
 };
 
diff --git a/packages/core/src/ui/components/ConfirmVoteDelegation/ConfirmVoteDelegation.stories.tsx b/packages/core/src/ui/components/ConfirmVoteDelegation/ConfirmVoteDelegation.stories.tsx
index 370d321303..4856756924 100644
--- a/packages/core/src/ui/components/ConfirmVoteDelegation/ConfirmVoteDelegation.stories.tsx
+++ b/packages/core/src/ui/components/ConfirmVoteDelegation/ConfirmVoteDelegation.stories.tsx
@@ -3,11 +3,25 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { ConfirmVoteDelegation } from './ConfirmVoteDelegation';
 import { ComponentProps } from 'react';
 
+const customViewports = {
+  popup: {
+    name: 'Popup',
+    styles: {
+      width: '360px',
+      height: '600'
+    }
+  }
+};
+
 const meta: Meta<typeof ConfirmVoteDelegation> = {
-  title: 'ConfirmVoteDelegation',
+  title: 'Sanchonet/Certificates/ConfirmVoteDelegation',
   component: ConfirmVoteDelegation,
   parameters: {
-    layout: 'centered'
+    layout: 'centered',
+    viewport: {
+      viewports: customViewports,
+      defaultViewport: 'popup'
+    }
   }
 };
 
diff --git a/packages/core/src/ui/components/ConfirmVoteRegistrationDelegation/ConfirmVoteRegistrationDelegation.stories.tsx b/packages/core/src/ui/components/ConfirmVoteRegistrationDelegation/ConfirmVoteRegistrationDelegation.stories.tsx
index 2ca239f068..03427a18c5 100644
--- a/packages/core/src/ui/components/ConfirmVoteRegistrationDelegation/ConfirmVoteRegistrationDelegation.stories.tsx
+++ b/packages/core/src/ui/components/ConfirmVoteRegistrationDelegation/ConfirmVoteRegistrationDelegation.stories.tsx
@@ -3,11 +3,25 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { ConfirmVoteRegistrationDelegation } from './ConfirmVoteRegistrationDelegation';
 import { ComponentProps } from 'react';
 
+const customViewports = {
+  popup: {
+    name: 'Popup',
+    styles: {
+      width: '360px',
+      height: '600'
+    }
+  }
+};
+
 const meta: Meta<typeof ConfirmVoteRegistrationDelegation> = {
-  title: 'ConfirmVoteRegistrationDelegation',
+  title: 'Sanchonet/Certificates/ConfirmVoteRegistrationDelegation',
   component: ConfirmVoteRegistrationDelegation,
   parameters: {
-    layout: 'centered'
+    layout: 'centered',
+    viewport: {
+      viewports: customViewports,
+      defaultViewport: 'popup'
+    }
   }
 };
 
diff --git a/packages/core/src/ui/components/ProposalProcedures/HardForkInitiationAction/HardForkInitiationAction.stories.tsx b/packages/core/src/ui/components/ProposalProcedures/HardForkInitiationAction/HardForkInitiationAction.stories.tsx
index b50685d593..b83903a3b6 100644
--- a/packages/core/src/ui/components/ProposalProcedures/HardForkInitiationAction/HardForkInitiationAction.stories.tsx
+++ b/packages/core/src/ui/components/ProposalProcedures/HardForkInitiationAction/HardForkInitiationAction.stories.tsx
@@ -14,7 +14,7 @@ const customViewports = {
 };
 
 const meta: Meta<typeof HardForkInitiationAction> = {
-  title: 'ProposalProcedure/HardForkInitiationAction',
+  title: 'Sanchonet/Proposal Procedures/HardForkInitiationAction',
   component: HardForkInitiationAction,
   parameters: {
     layout: 'centered',
diff --git a/packages/core/src/ui/components/ProposalProcedures/InfoAction/InfoAction.stories.tsx b/packages/core/src/ui/components/ProposalProcedures/InfoAction/InfoAction.stories.tsx
index 3f97136d22..12ee1f7ec3 100644
--- a/packages/core/src/ui/components/ProposalProcedures/InfoAction/InfoAction.stories.tsx
+++ b/packages/core/src/ui/components/ProposalProcedures/InfoAction/InfoAction.stories.tsx
@@ -14,7 +14,7 @@ const customViewports = {
 };
 
 const meta: Meta<typeof InfoAction> = {
-  title: 'ProposalProcedure/InfoAction',
+  title: 'Sanchonet/Proposal Procedures/InfoAction',
   component: InfoAction,
   parameters: {
     layout: 'centered',
diff --git a/packages/core/src/ui/components/ProposalProcedures/NewConstitutionAction/NewConstitutionAction.stories.tsx b/packages/core/src/ui/components/ProposalProcedures/NewConstitutionAction/NewConstitutionAction.stories.tsx
index d6fc007a4c..1611deeb77 100644
--- a/packages/core/src/ui/components/ProposalProcedures/NewConstitutionAction/NewConstitutionAction.stories.tsx
+++ b/packages/core/src/ui/components/ProposalProcedures/NewConstitutionAction/NewConstitutionAction.stories.tsx
@@ -14,7 +14,7 @@ const customViewports = {
 };
 
 const meta: Meta<typeof NewConstitutionAction> = {
-  title: 'ProposalProcedure/NewConstitutionAction',
+  title: 'Sanchonet/Proposal Procedures/NewConstitutionAction',
   component: NewConstitutionAction,
   parameters: {
     layout: 'centered',
diff --git a/packages/core/src/ui/components/ProposalProcedures/NoConfidenceAction/NoConfidenceAction.stories.tsx b/packages/core/src/ui/components/ProposalProcedures/NoConfidenceAction/NoConfidenceAction.stories.tsx
index 81092e9bfe..87489f87ff 100644
--- a/packages/core/src/ui/components/ProposalProcedures/NoConfidenceAction/NoConfidenceAction.stories.tsx
+++ b/packages/core/src/ui/components/ProposalProcedures/NoConfidenceAction/NoConfidenceAction.stories.tsx
@@ -14,7 +14,7 @@ const customViewports = {
 };
 
 const meta: Meta<typeof NoConfidenceAction> = {
-  title: 'ProposalProcedure/NoConfidenceAction',
+  title: 'Sanchonet/Proposal Procedures/NoConfidenceAction',
   component: NoConfidenceAction,
   parameters: {
     layout: 'centered',
diff --git a/packages/core/src/ui/components/ProposalProcedures/ParameterChangeAction/ParameterChangeAction.stories.tsx b/packages/core/src/ui/components/ProposalProcedures/ParameterChangeAction/ParameterChangeAction.stories.tsx
index 2e4fababde..d34449ed19 100644
--- a/packages/core/src/ui/components/ProposalProcedures/ParameterChangeAction/ParameterChangeAction.stories.tsx
+++ b/packages/core/src/ui/components/ProposalProcedures/ParameterChangeAction/ParameterChangeAction.stories.tsx
@@ -14,7 +14,7 @@ const customViewports = {
 };
 
 const meta: Meta<typeof ParameterChangeAction> = {
-  title: 'ProposalProcedure/ParameterChangeAction',
+  title: 'Sanchonet/Proposal Procedures/ParameterChangeAction',
   component: ParameterChangeAction,
   parameters: {
     layout: 'centered',
diff --git a/packages/core/src/ui/components/ProposalProcedures/TreasuryWithdrawalsAction/TreasuryWithdrawalsAction.stories.tsx b/packages/core/src/ui/components/ProposalProcedures/TreasuryWithdrawalsAction/TreasuryWithdrawalsAction.stories.tsx
index 951be959cd..e26c6d301b 100644
--- a/packages/core/src/ui/components/ProposalProcedures/TreasuryWithdrawalsAction/TreasuryWithdrawalsAction.stories.tsx
+++ b/packages/core/src/ui/components/ProposalProcedures/TreasuryWithdrawalsAction/TreasuryWithdrawalsAction.stories.tsx
@@ -14,7 +14,7 @@ const customViewports = {
 };
 
 const meta: Meta<typeof TreasuryWithdrawalsAction> = {
-  title: 'ProposalProcedure/TreasuryWithdrawalsAction',
+  title: 'Sanchonet/Proposal Procedures/TreasuryWithdrawalsAction',
   component: TreasuryWithdrawalsAction,
   parameters: {
     layout: 'centered',
diff --git a/packages/core/src/ui/components/ProposalProcedures/UpdateCommitteeAction/UpdateCommitteeActionAction.stories.tsx b/packages/core/src/ui/components/ProposalProcedures/UpdateCommitteeAction/UpdateCommitteeActionAction.stories.tsx
index 9750fa1551..ca3378c9cf 100644
--- a/packages/core/src/ui/components/ProposalProcedures/UpdateCommitteeAction/UpdateCommitteeActionAction.stories.tsx
+++ b/packages/core/src/ui/components/ProposalProcedures/UpdateCommitteeAction/UpdateCommitteeActionAction.stories.tsx
@@ -14,7 +14,7 @@ const customViewports = {
 };
 
 const meta: Meta<typeof UpdateCommitteeAction> = {
-  title: 'ProposalProcedure/UpdateCommitteeAction',
+  title: 'Sanchonet/Proposal Procedures/UpdateCommitteeAction',
   component: UpdateCommitteeAction,
   parameters: {
     layout: 'centered',
diff --git a/packages/core/src/ui/components/ProposalProcedures/components/Card.tsx b/packages/core/src/ui/components/ProposalProcedures/components/Card.tsx
index 44bed28c23..503ff0ad69 100644
--- a/packages/core/src/ui/components/ProposalProcedures/components/Card.tsx
+++ b/packages/core/src/ui/components/ProposalProcedures/components/Card.tsx
@@ -21,7 +21,7 @@ export const Card = ({ title, tooltip, data }: Props): JSX.Element => {
   });
 
   const renderRow = (props: Item) => (
-    <>
+    <React.Fragment key={props.label}>
       <Cell>
         <Flex>
           {props.tooltip ? (
@@ -50,7 +50,7 @@ export const Card = ({ title, tooltip, data }: Props): JSX.Element => {
           )}
         </Flex>
       </Cell>
-    </>
+    </React.Fragment>
   );
 
   const renderTitle = () => {
diff --git a/packages/core/src/ui/components/VotingProcedures/VotingProcedures.stories.tsx b/packages/core/src/ui/components/VotingProcedures/VotingProcedures.stories.tsx
index 72a297d798..3e1c6cf245 100644
--- a/packages/core/src/ui/components/VotingProcedures/VotingProcedures.stories.tsx
+++ b/packages/core/src/ui/components/VotingProcedures/VotingProcedures.stories.tsx
@@ -3,11 +3,25 @@ import type { Meta, StoryObj } from '@storybook/react';
 import { VotingProcedures } from './VotingProcedures';
 import { ComponentProps } from 'react';
 
+const customViewports = {
+  popup: {
+    name: 'Popup',
+    styles: {
+      width: '360px',
+      height: '600'
+    }
+  }
+};
+
 const meta: Meta<typeof VotingProcedures> = {
-  title: 'VotingProcedures',
+  title: 'Sanchonet/Voting/Procedures',
   component: VotingProcedures,
   parameters: {
-    layout: 'centered'
+    layout: 'centered',
+    viewport: {
+      viewports: customViewports,
+      defaultViewport: 'popup'
+    }
   }
 };
 
@@ -82,7 +96,7 @@ export const MultipleVotes: Story = {
       {
         voter: {
           type: 'DRep',
-          dRepId: 'drep1cs234l5mtapethapx8cq97nkpa27xf84phruh5f6jqxa78ymlp4'
+          dRepId: 'drep1cs234l5mtapethapx8cq97nkpa27xf84phruh5f6jqxa78ymlp5'
         },
         votes: [
           {