diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 675d21d..fcc7d71 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -11,6 +11,8 @@ module.exports = {
   parser: '@typescript-eslint/parser',
   plugins: ['react-refresh'],
   rules: {
+    'no-unused-expressions': 'off',
+    '@typescript-eslint/no-unused-expressions': 'off',
     'react-hooks/exhaustive-deps': [
       'warn',
       {
diff --git a/src/components/DelegateCard.tsx b/src/components/DelegateCard.tsx
index 824e17d..abe63d7 100644
--- a/src/components/DelegateCard.tsx
+++ b/src/components/DelegateCard.tsx
@@ -1,18 +1,9 @@
 import { Button } from '@/components/ui/button'
 import { Card } from '@/components/ui/card'
-import { Check, Copy, Ellipsis } from 'lucide-react'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTrigger,
-} from '@/components/ui/dialog'
-import { ellipsisFn } from '@polkadot-ui/utils'
 import { useNavigate } from 'react-router-dom'
-import copy from 'copy-to-clipboard'
 import { useEffect, useState } from 'react'
 import { Delegate } from '@/contexts/DelegatesContext'
+import { ContentReveal } from './ui/content-reveal'
 
 interface Props {
   delegate: Delegate
@@ -30,6 +21,7 @@ export const DelegateCard = ({ delegate: d }: Props) => {
   const onDelegate = () => {
     navigate(`/delegate/${d.address}`)
   }
+
   return (
     <Card className="mb-5 flex flex-col border-2 p-2">
       <div className="flex columns-3">
@@ -37,43 +29,19 @@ export const DelegateCard = ({ delegate: d }: Props) => {
           <img className="rounded-3xl" width="100" src={d.image} />
         </div>
         <div className="w-[85%] p-2">
-          <div className="font-bold">{d.name}</div>
-          <div className="">{d.shortDescription}</div>
-          <Button variant="default" className="mt-2" onClick={onDelegate}>
-            Delegate
-          </Button>
+          <div className="py-2 text-xl font-bold text-primary">{d.name}</div>
+          <div>{d.shortDescription}</div>
+          <ContentReveal
+            hidden={
+              d.shortDescription === d.longDescription || !d.longDescription
+            }
+          >
+            {d.longDescription}
+          </ContentReveal>
         </div>
-        <Dialog>
-          <DialogTrigger asChild>
-            <Button variant={'outline'} className="text-xs">
-              <Ellipsis className="text-xs" />
-            </Button>
-          </DialogTrigger>
-          <DialogContent className="">
-            <DialogHeader>
-              <div className="font-bold">{d.name}</div>
-            </DialogHeader>
-            <DialogDescription className="flex">
-              <div>{ellipsisFn(d.address)}</div>
-              <div className="cursor-pointer pl-4">
-                {copied ? (
-                  <Check className="text-[green]" />
-                ) : (
-                  <Copy
-                    className="cursor-pointer"
-                    onClick={() => {
-                      setCopied(true)
-                      copy(d.address)
-                    }}
-                  />
-                )}
-              </div>
-            </DialogDescription>
-            <div className="grid py-4">
-              <div className="items-center">{d.longDescription}</div>
-            </div>
-          </DialogContent>
-        </Dialog>
+        <Button variant="default" onClick={onDelegate} className="">
+          Delegate
+        </Button>
       </div>
       <div className="w-full"></div>
     </Card>
diff --git a/src/components/LocksCard.tsx b/src/components/LocksCard.tsx
index e8c4033..71091b6 100644
--- a/src/components/LocksCard.tsx
+++ b/src/components/LocksCard.tsx
@@ -17,6 +17,7 @@ import { useAccounts } from '@/contexts/AccountsContext'
 import { TypedApi } from 'polkadot-api'
 import { getUnlockUnvoteTx } from '@/lib/utils'
 import { useLocks, VoteLock } from '@/contexts/LocksContext'
+import { Skeleton } from './ui/skeleton'
 
 export const LocksCard = () => {
   const [currentBlock, setCurrentBlock] = useState(0)
@@ -26,6 +27,7 @@ export const LocksCard = () => {
   const { assetInfo } = useNetwork()
   const [ongoingVoteLocks, setOngoingVoteLocks] = useState<VoteLock[]>([])
   const [freeLocks, setFreeLocks] = useState<VoteLock[]>([])
+  const [locksLoaded, setLocksLoaded] = useState<boolean>(false)
   const [currentLocks, setCurrentLocks] = useState<VoteLock[]>([])
   const { selectedAccount } = useAccounts()
   const [isUnlockingLoading, setIsUnlockingLoading] = useState(false)
@@ -50,6 +52,7 @@ export const LocksCard = () => {
     setOngoingVoteLocks(tempOngoingLocks)
     setFreeLocks(tempFree)
     setCurrentLocks(tempCurrent)
+    setLocksLoaded(true)
   }, [currentBlock, locks])
 
   useEffect(() => {
@@ -100,9 +103,6 @@ export const LocksCard = () => {
       })
   }, [api, freeLocks, selectedAccount])
 
-  if (!ongoingVoteLocks?.length && !freeLocks?.length && !currentLocks.length)
-    return null
-
   return (
     <div className="flex w-full gap-x-2">
       {freeLocks.length > 0 && (
@@ -145,62 +145,71 @@ export const LocksCard = () => {
           </div>
         </Card>
       )}
-      {currentLocks.length > 0 && (
-        <Card className="h-full w-4/12 border-2 p-2 px-4">
-          <Title variant="h4">Locked</Title>
-          <div className="text-5xl font-bold">
-            {currentLocks.length}
-            <Clock2 className="inline-block h-8 w-8 rotate-[10deg] text-gray-200" />
-          </div>
-          <ContentReveal>
-            {currentLocks.map(({ amount, endBlock, refId }) => {
-              const remainingTimeMs =
-                (Number(endBlock) - currentBlock) * expectedBlockTime
-              const remainingDisplay = convertMiliseconds(remainingTimeMs)
-              return (
-                <div key={refId}>
-                  <ul>
-                    <li>
-                      <Badge>#{refId}</Badge>{' '}
-                      {planckToUnit(amount, assetInfo.precision).toLocaleString(
-                        'en',
-                      )}{' '}
-                      {assetInfo.symbol}
-                      <br />
-                      Remaining: {displayRemainingTime(remainingDisplay)}
-                    </li>
-                  </ul>
-                </div>
-              )
-            })}
-          </ContentReveal>
-        </Card>
-      )}
-      {ongoingVoteLocks.length > 0 && (
-        <Card className="h-full w-4/12 border-2 p-2 px-4">
-          <Title variant="h4">Votes</Title>
-          <div className="text-5xl font-bold">
-            {ongoingVoteLocks.length}
-            <Vote className="inline-block h-8 w-8 text-gray-200" />
-          </div>
-          <ContentReveal>
-            {ongoingVoteLocks.map(({ amount, refId }) => {
-              return (
-                <div key={refId}>
-                  <ul>
-                    <li>
-                      <Badge>#{refId}</Badge>{' '}
-                      {planckToUnit(amount, assetInfo.precision).toLocaleString(
-                        'en',
-                      )}{' '}
-                      {assetInfo.symbol}
-                    </li>
-                  </ul>
-                </div>
-              )
-            })}
-          </ContentReveal>
-        </Card>
+      {!locksLoaded ? (
+        <>
+          <Skeleton className="h-[116px] w-4/12 rounded-xl" />
+          <Skeleton className="h-[116px] w-4/12 rounded-xl" />
+        </>
+      ) : (
+        <>
+          <Card className="h-full w-4/12 border-2 p-2 px-4">
+            <Title variant="h4">Locked</Title>
+            <div className="text-5xl font-bold">
+              {currentLocks.length}
+              <Clock2 className="inline-block h-8 w-8 rotate-[10deg] text-gray-200" />
+            </div>
+            <ContentReveal hidden={!currentLocks.length}>
+              {currentLocks.map(({ amount, endBlock, refId }) => {
+                const remainingTimeMs =
+                  (Number(endBlock) - currentBlock) * expectedBlockTime
+                const remainingDisplay = convertMiliseconds(remainingTimeMs)
+                return (
+                  <div key={refId}>
+                    <ul>
+                      <li>
+                        <Badge>#{refId}</Badge>{' '}
+                        {planckToUnit(
+                          amount,
+                          assetInfo.precision,
+                        ).toLocaleString('en')}{' '}
+                        {assetInfo.symbol}
+                        <br />
+                        Remaining: {displayRemainingTime(remainingDisplay)}
+                      </li>
+                    </ul>
+                  </div>
+                )
+              })}
+            </ContentReveal>
+          </Card>
+          <Card className="h-full w-4/12 border-2 p-2 px-4">
+            <Title variant="h4">Votes</Title>
+            <div className="text-5xl font-bold">
+              {ongoingVoteLocks.length}
+              <Vote className="inline-block h-8 w-8 text-gray-200" />
+            </div>
+            {
+              <ContentReveal hidden={!ongoingVoteLocks.length}>
+                {ongoingVoteLocks.map(({ amount, refId }) => {
+                  return (
+                    <div key={refId}>
+                      <ul>
+                        <li>
+                          <Badge>#{refId}</Badge>{' '}
+                          {planckToUnit(
+                            amount,
+                            assetInfo.precision,
+                          ).toLocaleString('en')}{' '}
+                          {assetInfo.symbol}
+                        </li>
+                      </ul>
+                    </div>
+                  )
+                })}
+              </ContentReveal>
+            }
+          </Card>
+        </>
       )}
     </div>
   )
diff --git a/src/components/ui/content-reveal.tsx b/src/components/ui/content-reveal.tsx
index 25d1b3c..704a27c 100644
--- a/src/components/ui/content-reveal.tsx
+++ b/src/components/ui/content-reveal.tsx
@@ -1,19 +1,33 @@
+import { cn } from '@/lib/utils'
 import { ChevronDown } from 'lucide-react'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 
 type Props = {
   children: React.ReactNode
   className?: string
+  hidden?: boolean
 }
 
-export const ContentReveal = ({ children, className }: Props) => {
+export const ContentReveal = ({ children, className, hidden }: Props) => {
   const [isOpen, setIsOpen] = useState(false)
 
+  useEffect(() => {
+    if (hidden) {
+      setIsOpen(false)
+    }
+  }, [hidden])
+
   return (
     <div className={className}>
       <button
-        onClick={() => setIsOpen(!isOpen)}
-        className="flex w-full items-center justify-center"
+        onClick={() => {
+          !hidden && setIsOpen(!isOpen)
+        }}
+        className={cn(
+          `flex w-full items-center justify-center`,
+          hidden && 'opacity-0',
+        )}
+        disabled={hidden}
       >
         <ChevronDown
           className={`transition-transform duration-300 ${
diff --git a/src/components/ui/skeleton.tsx b/src/components/ui/skeleton.tsx
new file mode 100644
index 0000000..c23a30d
--- /dev/null
+++ b/src/components/ui/skeleton.tsx
@@ -0,0 +1,15 @@
+import { cn } from '@/lib/utils'
+
+function Skeleton({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) {
+  return (
+    <div
+      className={cn('animate-pulse rounded-md bg-muted', className)}
+      {...props}
+    />
+  )
+}
+
+export { Skeleton }