diff --git a/app/allocation/[category]/components/RankingRow.tsx b/app/allocation/[category]/components/RankingRow.tsx
index 23c4ba9..167e6e9 100644
--- a/app/allocation/[category]/components/RankingRow.tsx
+++ b/app/allocation/[category]/components/RankingRow.tsx
@@ -35,7 +35,11 @@ const RankingRow: FC<IRankingRowProps> = ({
   };
 
   return (
-    <tr className="flex w-full items-center justify-around border-b border-gray-200 bg-gray-50">
+    <tr
+      className={`flex w-full items-center justify-around rounded-lg border border-gray-200 ${
+        locked && 'bg-gray-100'
+      }`}
+    >
       <td className="pb-8 pl-4 pt-4">
         <Checkbox
           checked={selected}
@@ -64,7 +68,11 @@ const RankingRow: FC<IRankingRowProps> = ({
         </div>
       </td>
       <td className="pb-8 pl-4 pt-4">
-        <div className="flex items-center justify-center rounded-md border border-gray-200 bg-gray-50 px-4 py-2">
+        <div
+          className={`flex items-center justify-center rounded-md border border-gray-200 px-4 py-2 ${
+            locked && 'bg-gray-100'
+          }`}
+        >
           <p className="text-gray-700">{index + 1}</p>
         </div>
       </td>
@@ -79,9 +87,12 @@ const RankingRow: FC<IRankingRowProps> = ({
               values?.floatValue ? values.floatValue / 100 : 0
             );
           }}
-          className="w-24 rounded-md border border-gray-200 bg-gray-50 px-4 py-2 text-center focus:outline-none focus:ring-1"
+          className={`w-24 rounded-md border border-gray-200 px-4 py-2 text-center focus:outline-none focus:ring-1 ${
+            locked && 'bg-gray-100'
+          }`}
           placeholder="0.00%"
           isAllowed={values => handleAllowdValue(values)}
+          disabled={locked}
         />
         <span className="absolute bottom-2 right-7 text-xs text-gray-400">
           {formatBudget(budget)}
@@ -91,9 +102,7 @@ const RankingRow: FC<IRankingRowProps> = ({
         <button
           className={`flex items-center justify-center rounded-md border p-2
         ${
-    locked
-      ? 'rounded-md border-[#232634] bg-[#232634]'
-      : 'border-gray-50'
+    locked ? 'rounded-md border-[#232634] bg-[#232634]' : 'border-gray-50'
     }`}
           onClick={() => onLock(project.projectId)}
         >
diff --git a/app/allocation/[category]/page.tsx b/app/allocation/[category]/page.tsx
index 72cf6e9..7f482ee 100644
--- a/app/allocation/[category]/page.tsx
+++ b/app/allocation/[category]/page.tsx
@@ -13,6 +13,7 @@ import {
 } from '../../comparison/utils/helpers';
 import { Checkbox } from '@/app/utils/Checkbox';
 import { LockIcon } from '@/public/assets/icon-components/Lock';
+import { UnlockIcon } from '@/public/assets/icon-components/Unlock';
 import NotFoundComponent from '@/app/components/404';
 import {
   useProjectsRankingByCategoryId,
@@ -51,6 +52,8 @@ const RankingPage = () => {
   const [rankingArray, setRankingArray] = useState<IProjectRankingObj[]>([]);
   const [totalShareError, setTotalShareError] = useState<string | null>(null);
   const [lockedItems, setLockedItems] = useState<number[]>([]);
+  const [isLocked, setIsLocked] = useState(false);
+  const [isUnlocked, setIsUnlocked] = useState(false);
 
   const { data: categoryRankings } = useCategoryRankings();
   const { data: ranking, isLoading } = useProjectsRankingByCategoryId(category);
@@ -89,6 +92,30 @@ const RankingPage = () => {
     }
   };
 
+  const lockSelection = () => {
+    if (!projects) return;
+
+    const lockedProjects = checkedItems.filter(
+      checkedId => !lockedItems.includes(checkedId)
+    );
+
+    setLockedItems([...lockedItems, ...lockedProjects]);
+    setCheckedItems([]);
+  };
+
+  const unlockSelection = () => {
+    if (!projects) return;
+
+    const unlockedProjects = checkedItems.filter(checkedId =>
+      lockedItems.includes(checkedId)
+    );
+
+    setLockedItems(
+      lockedItems.filter(lockedId => !unlockedProjects.includes(lockedId))
+    );
+    setCheckedItems([]);
+  };
+
   const selectItem = (id: number) => {
     if (checkedItems.includes(id)) {
       setCheckedItems(checkedItems.filter(checkedId => checkedId !== id));
@@ -134,6 +161,40 @@ const RankingPage = () => {
     updateProjectRanking();
   };
 
+  useEffect(() => {
+    if (!projects || projects.length === 0) {
+      setIsLocked(false);
+      setIsUnlocked(true);
+      return;
+    }
+
+    const allLocked = lockedItems.length === projects.length;
+    const noneLocked = lockedItems.length === 0;
+    const checkedLocked = checkedItems.every(id => lockedItems.includes(id));
+    const checkedUnlocked = checkedItems.every(
+      id => !lockedItems.includes(id)
+    );
+    const someLocked = checkedItems.some(id => lockedItems.includes(id));
+    const someUnlocked = checkedItems.some(id => !lockedItems.includes(id));
+
+    if (allLocked || checkedLocked) {
+      setIsLocked(true);
+      setIsUnlocked(false);
+    }
+    else if (noneLocked || checkedUnlocked) {
+      setIsLocked(false);
+      setIsUnlocked(true);
+    }
+    else if (someLocked || someUnlocked) {
+      setIsLocked(true);
+      setIsUnlocked(true);
+    }
+    else {
+      setIsLocked(false);
+      setIsUnlocked(false);
+    }
+  }, [projects, lockedItems, checkedItems]);
+
   useEffect(() => {
     if (ranking) setProjects(ranking?.ranking);
   }, [ranking]);
@@ -184,15 +245,38 @@ const RankingPage = () => {
                   items selected
                 </p>
               </div>
-              <div className="h-6 border-r border-gray-200"></div>
-              <button className="flex items-center justify-center gap-2">
-                <LockIcon />
-                <p className="text-sm text-gray-600">Lock allocation</p>
-              </button>
+              {projects?.length && checkedItems.length > 0 && (
+                <>
+                  <div className="h-6 border-r border-gray-200" />
+                  {isLocked && (
+                    <button
+                      className="flex items-center justify-center gap-2"
+                      onClick={unlockSelection}
+                    >
+                      <UnlockIcon />
+                      <p className="text-sm text-gray-600">Unlock selection</p>
+                    </button>
+                  )}
+                  {isLocked && isUnlocked && (
+                    <div className="h-6 border-r border-gray-200" />
+                  )}
+                  {isUnlocked && (
+                    <button
+                      className="flex items-center justify-center gap-2"
+                      onClick={lockSelection}
+                    >
+                      <LockIcon />
+                      <p className="text-sm text-gray-600">Lock selection</p>
+                    </button>
+                  )}
+                </>
+              )}
             </div>
             <div className="flex gap-4">
               <p className="text-sm font-medium text-gray-400">
-                0 items locked
+                {lockedItems.length}
+                {' '}
+                items locked
               </p>
             </div>
           </div>
diff --git a/app/allocation/components/EOA/EmailLoginModal.tsx b/app/allocation/components/EOA/EmailLoginModal.tsx
index 4c88553..ece6513 100644
--- a/app/allocation/components/EOA/EmailLoginModal.tsx
+++ b/app/allocation/components/EOA/EmailLoginModal.tsx
@@ -176,6 +176,7 @@ const EmailLoginModal = ({ closeModal, selectedCategoryId }: TEmailLoginModalPro
                     setOAuthData={setOAuthData}
                     sendOTP={sendOTP}
                     setStep={setStep}
+                    closeModal={closeModal}
                   />
                 )
               : (
@@ -186,6 +187,7 @@ const EmailLoginModal = ({ closeModal, selectedCategoryId }: TEmailLoginModalPro
                     setEoaWallet={setEoaWallet}
                     setStep={setStep}
                     resendOTP={sendOTP}
+                    closeModal={closeModal}
                   />
                 )}
           </div>
diff --git a/app/allocation/components/EOA/MethodSelection.tsx b/app/allocation/components/EOA/MethodSelection.tsx
index 94129e5..6b3f4b8 100644
--- a/app/allocation/components/EOA/MethodSelection.tsx
+++ b/app/allocation/components/EOA/MethodSelection.tsx
@@ -1,6 +1,7 @@
 import React, { FC, FormEvent } from 'react';
 import Image from 'next/image';
 import { Wallet } from 'thirdweb/wallets';
+import { useConnect } from 'thirdweb/react';
 import {
   createSmartWalletFromEOA,
   createSocialEoa,
@@ -8,6 +9,7 @@ import {
 } from '@/app/lib/third-web/methods';
 import { TOTPData, TOAuthData, Step } from './EmailLoginModal';
 import { InfoIcon } from '@/public/assets/icon-components/Info';
+import StorageLabel from '@/app/lib/localStorage';
 
 interface IMethodSelectionProps {
   pickedMethod: Strategy | 'email' | null
@@ -19,6 +21,7 @@ interface IMethodSelectionProps {
   setOtpData: (data: TOTPData) => void
   sendOTP: () => void
   setStep: (step: Step) => void
+  closeModal: () => void
 }
 
 export const MethodSelection: FC<IMethodSelectionProps> = ({
@@ -31,7 +34,10 @@ export const MethodSelection: FC<IMethodSelectionProps> = ({
   setOtpData,
   sendOTP,
   setStep,
+  closeModal,
 }) => {
+  const { connect } = useConnect();
+
   const handleOAuthConnect = (strategy: Strategy) => async () => {
     try {
       setPickedMethod(strategy);
@@ -42,20 +48,30 @@ export const MethodSelection: FC<IMethodSelectionProps> = ({
       if (!account) throw new Error(`Unable to create a ${strategy} EOA`);
 
       const smartWallet = await createSmartWalletFromEOA(account);
-      console.log('Connected EOA wallet ==> ', smartWallet);
       setEoaWallet(smartWallet);
       setOAuthData({ ...oAuthData, loading: false });
-      setStep(Step.CONNECT_EOA);
-      setPickedMethod(null);
+
+      const personalWalletId = localStorage.getItem(
+        StorageLabel.LAST_CONNECT_PERSONAL_WALLET_ID
+      );
+
+      if (!personalWalletId) {
+        setStep(Step.CONNECT_EOA);
+        setPickedMethod(null);
+      }
+      else {
+        console.log('Connecting to smart wallet');
+        connect(smartWallet);
+        closeModal();
+      }
     }
     catch (error: any) {
-      if (error.message === 'User closed login window') dismissOAuthError();
-      else
-        setOAuthData({
-          ...oAuthData,
-          loading: true,
-          error: 'There was a problem connecting to your Google account',
-        });
+      console.error(error);
+      setOAuthData({
+        ...oAuthData,
+        loading: true,
+        error: 'There was a problem connecting to your Google account',
+      });
     }
   };
 
@@ -137,7 +153,7 @@ export const MethodSelection: FC<IMethodSelectionProps> = ({
                   )
                 : (
                     <button
-                      className="my-4 flex w-full items-center justify-center gap-2 rounded-lg border border-gray-200 px-4 py-2 font-semibold text-gray-600"
+                      className="my-4 flex w-full items-center justify-center gap-2 rounded-lg border border-gray-200 px-4 py-2 font-semibold text-gray-600 shadow-sm"
                       onClick={handleOAuthConnect(Strategy.Google)}
                     >
                       <Image
@@ -173,7 +189,7 @@ export const MethodSelection: FC<IMethodSelectionProps> = ({
                     onChange={handleEmailChange}
                     onBlur={handleEmailBlur}
                     placeholder="Enter your email"
-                    className={`w-full rounded-lg border px-4 py-2 placeholder:text-gray-400 
+                    className={`w-full rounded-lg border px-4 py-2 placeholder:text-gray-500 
           ${otpData.emailError ? 'border-red-500' : 'border-gray-200'} 
           focus:outline-none ${
             otpData.email && otpData.emailError
@@ -195,9 +211,9 @@ export const MethodSelection: FC<IMethodSelectionProps> = ({
                 )}
               </div>
               <button
-                className={`w-full rounded-lg border px-4 py-2 font-semibold ${
+                className={`w-full rounded-lg border px-4 py-2 text-sm font-semibold shadow-sm ${
                   !otpData.email || otpData.emailError
-                    ? 'bg-gray-300 text-gray-500'
+                    ? 'text-gray-500'
                     : 'bg-primary text-white'
                 } transition duration-300`}
                 onClick={sendOTP}
diff --git a/app/allocation/components/EOA/OTPVerification.tsx b/app/allocation/components/EOA/OTPVerification.tsx
index e49f2a0..f910503 100644
--- a/app/allocation/components/EOA/OTPVerification.tsx
+++ b/app/allocation/components/EOA/OTPVerification.tsx
@@ -6,6 +6,7 @@ import React, {
   useState,
 } from 'react';
 import { Wallet } from 'thirdweb/wallets';
+import { useConnect } from 'thirdweb/react';
 import { TOTPData, OtpStatus, Step } from './EmailLoginModal';
 import { EditIcon } from '@/public/assets/icon-components/Edit';
 import { BackArrowIcon } from '@/public/assets/icon-components/BackArrow';
@@ -13,6 +14,7 @@ import {
   createEmailEoa,
   createSmartWalletFromEOA,
 } from '@/app/lib/third-web/methods';
+import StorageLabel from '@/app/lib/localStorage';
 
 interface IOTPVerificationProps {
   otpData: TOTPData
@@ -21,10 +23,11 @@ interface IOTPVerificationProps {
   setEoaWallet: (wallet: Wallet) => void
   setStep: (step: number) => void
   resendOTP: () => void
+  closeModal: () => void
 }
 
-const FIVE_MINUTES = 5 * 60 * 1000;
-const INITIAL_TIMER = 5 * 60;
+const FIVE_MINUTES = 1 * 60 * 1000;
+const INITIAL_TIMER = 1 * 60;
 
 export const OTPVerification: FC<IOTPVerificationProps> = ({
   otpData,
@@ -33,7 +36,10 @@ export const OTPVerification: FC<IOTPVerificationProps> = ({
   setEoaWallet,
   setStep,
   resendOTP,
+  closeModal,
 }) => {
+  const { connect } = useConnect();
+
   const [timer, setTimer] = useState<number>(INITIAL_TIMER);
 
   useEffect(() => {
@@ -95,6 +101,16 @@ export const OTPVerification: FC<IOTPVerificationProps> = ({
       return;
     }
 
+    if (otpData.sentAt && otpData.sentAt < Date.now() - FIVE_MINUTES) {
+      setOtpData({
+        ...otpData,
+        loading: false,
+        otpStatus: OtpStatus.EXPIRED,
+      });
+      setStep(Step.OTP);
+      return;
+    }
+
     try {
       const emailEoa = await createEmailEoa(email, verificationCode);
       const account = emailEoa.getAccount();
@@ -102,8 +118,19 @@ export const OTPVerification: FC<IOTPVerificationProps> = ({
       if (!account) throw new Error('Unable to create an email EOA');
 
       const smartWallet = await createSmartWalletFromEOA(account);
-      setEoaWallet(smartWallet);
-      setStep(Step.CONNECT_EOA);
+
+      const personalWalletId = localStorage.getItem(
+        StorageLabel.LAST_CONNECT_PERSONAL_WALLET_ID
+      );
+
+      if (!personalWalletId) {
+        setEoaWallet(smartWallet);
+        setStep(Step.CONNECT_EOA);
+      }
+      else {
+        connect(smartWallet);
+        closeModal();
+      }
     }
     catch {
       setOtpData({
@@ -115,19 +142,18 @@ export const OTPVerification: FC<IOTPVerificationProps> = ({
     }
   };
 
-  const statusBorderClassSuffix: Record<OtpStatus, string> = {
-    [OtpStatus.VERIFIED]: 'success',
-    [OtpStatus.INCORRECT]: 'error',
-    [OtpStatus.FAILED]: 'error',
-    [OtpStatus.EXPIRED]: 'expired',
-    [OtpStatus.SENT]: '',
+  const statusClasses: Record<OtpStatus, string> = {
+    [OtpStatus.VERIFIED]:
+      'border-2 border-status-border-success bg-status-bg-success',
+    [OtpStatus.INCORRECT]:
+      'border-2 border-status-border-error bg-status-bg-error',
+    [OtpStatus.FAILED]:
+      'border-2 border-status-border-error bg-status-bg-error',
+    [OtpStatus.EXPIRED]:
+      'border-2 border-status-border-expired bg-status-bg-expired',
+    [OtpStatus.SENT]: 'border border-gray-300',
   };
 
-  const borderColour
-    = `border-2 border-status-border-${
-      statusBorderClassSuffix[otpData.otpStatus]
-    }` || 'border border-gray-300';
-
   const otpCodeFilled = otpData.verificationCode.length === 6;
 
   return (
@@ -160,7 +186,9 @@ export const OTPVerification: FC<IOTPVerificationProps> = ({
               key={index}
               type="text"
               maxLength={1}
-              className={`size-16 rounded-md text-center text-4xl font-semibold outline-none transition duration-300 placeholder:opacity-45 ${borderColour}`}
+              className={`size-16 rounded-md text-center text-4xl font-semibold outline-none transition duration-300 placeholder:opacity-45 ${
+                statusClasses[otpData.otpStatus]
+              }`}
               onChange={handleVerificationCodeChange}
               onKeyUp={handleKeyPress(
                 index === 5 ? '' : String(index + 1),
diff --git a/app/allocation/components/WorldIdSignInSuccessModal.tsx b/app/allocation/components/WorldIdSignInSuccessModal.tsx
index 2d4a893..28b54ce 100644
--- a/app/allocation/components/WorldIdSignInSuccessModal.tsx
+++ b/app/allocation/components/WorldIdSignInSuccessModal.tsx
@@ -22,9 +22,9 @@ const WorldIdSignInSuccessModal: React.FC<WorldIdModalProps> = ({
             </div>
           )
         : (
-            <div className="flex w-full flex-col items-center justify-center gap-6 px-14 py-10">
+            <div className="mt-6 flex w-[300px] flex-col items-center justify-center gap-6 px-14 py-10 md:w-[480px]">
               <div className="flex flex-col content-between items-center gap-2">
-                <div className="text-2xl font-semibold text-dark-500">Your voting power has been increased</div>
+                <div className="text-center text-2xl font-semibold text-dark-500">Your voting power has been increased</div>
                 <div className="text-sm text-[#232634]">Successfully connected to your World ID</div>
               </div>
               <div className="w-full text-center font-semibold">
diff --git a/app/utils/Modal.tsx b/app/utils/Modal.tsx
index 6dc2073..0855a81 100644
--- a/app/utils/Modal.tsx
+++ b/app/utils/Modal.tsx
@@ -37,7 +37,7 @@ const Modal: FC<ModalProps> = ({
 
   return ReactDOM.createPortal(
     <div className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50">
-      <div className="relative max-w-[60%] rounded-lg bg-white shadow-lg">
+      <div className="relative rounded-lg bg-white shadow-lg">
         {showCloseButton && (
           <div className="absolute right-5 top-5 z-10">
             <button
diff --git a/app/utils/wallet/modals/NotBhModal.tsx b/app/utils/wallet/modals/NotBhModal.tsx
index 46e7920..72e5149 100644
--- a/app/utils/wallet/modals/NotBhModal.tsx
+++ b/app/utils/wallet/modals/NotBhModal.tsx
@@ -58,7 +58,7 @@ const NotBadgeHolder: React.FC<SignedModalProps> = (
   }, [badges]);
   const router = useRouter();
   return (
-    <div className="relative flex flex-col items-center justify-center gap-6 rounded-lg bg-white bg-social-gradient px-24 py-8 text-center">
+    <div className="relative flex w-[600px] flex-col items-center justify-center gap-6 rounded-lg bg-white bg-social-gradient px-24 py-8 text-center md:w-[820px]">
       <h2 className="w-fit text-wrap text-4xl font-bold">Welcome to the Pairwise voting for "Retro Funding 6"</h2>
       {badges && Object.keys(badges).length > 0
         ? (
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 9880542..f551d71 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -43,15 +43,16 @@ const config: Config = {
         'status': {
           border: {
             success: '#75E0A7',
-            error: '#FDA29B',
+            error: '#FF99A1',
             expired: '#FEC84B',
           },
           text: {
-            error: '#D92D20',
+            error: '#FF0420',
             expired: '#DC6803',
           },
           bg: {
             error: '#FEF3F2',
+            expired: '#FFFAEB',
           },
         },
         'category-tab': {