diff --git a/.vscode/settings.json b/.vscode/settings.json
index 6f3a291..b30c3c0 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,6 @@
 {
-    "liveServer.settings.port": 5501
+    "liveServer.settings.port": 5501,
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "master"
+    ]
 }
\ No newline at end of file
diff --git a/documentation/assets/images/authorize-your-twitter-account.png b/documentation/assets/images/authorize-your-twitter-account.png
index 414ffbe..b07922c 100644
Binary files a/documentation/assets/images/authorize-your-twitter-account.png and b/documentation/assets/images/authorize-your-twitter-account.png differ
diff --git a/documentation/assets/images/get-your-promotion-code.png b/documentation/assets/images/get-your-promotion-code.png
new file mode 100644
index 0000000..d2f240f
Binary files /dev/null and b/documentation/assets/images/get-your-promotion-code.png differ
diff --git a/documentation/assets/images/reward-check-popup.png b/documentation/assets/images/reward-check-popup.png
new file mode 100644
index 0000000..56da372
Binary files /dev/null and b/documentation/assets/images/reward-check-popup.png differ
diff --git a/documentation/index.html b/documentation/index.html
index 97490cd..08eebed 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -207,7 +207,12 @@ <h6 id="#step6">Step 6: Claim Your Airdrop</h6>
 
             <h6 id="#step7">Final Step: (Optional) Get Your Promotion Code</h6>
             <p>If you have finished all of the missions, you can get your promotion code to recommend to others and automatically get additional $Lotso tokens for rewards when they claim their airdrop.</p>
-            <img src="assets/images/get-your-promotion-code.jpg" />
+            <img src="assets/images/get-your-promotion-code.png" />
+            <br><br><br><br>
+
+            <h6 id="#step8">Reward Check Step: (Optional) Check Your Total Reward</h6>
+            <p>After user claimed the airdrop via the promotion code you've provided, you can check your total reward as a gift in the popup window and reclaim the rewarded airdrop from the step 4.</p>
+            <img src="assets/images/reward-check-popup.png" />
             <br><br><br><br>
 
             <!-- Social Information -->
diff --git a/index.html b/index.html
index 6dd4bc1..9958492 100644
--- a/index.html
+++ b/index.html
@@ -98,9 +98,9 @@ <h5 class="modal-title">Block Kill</h5>
                         <div class="modal-body">
                             <form>
                                 <div class="info-txt">
-                                    <div><strong>Public Chain:</strong> Base</div>
-                                    <div><strong>Initial Liquidity Pool:</strong> 1ETH</div>
-                                    <div><strong>Risk Warning:</strong> "Prohibited to purchase within the first 40 seconds after market opening——anti-bot measures."</div>
+                                    <p><strong>Public Chain:</strong> Base</p>
+                                    <p><strong>Initial Liquidity Pool:</strong> 1ETH</p>
+                                    <p><strong>Risk Warning:</strong> "Prohibited to purchase within the first 40 seconds after market opening——anti-bot measures."</p>
                                 </div>
                             </form>
                         </div>
@@ -122,7 +122,7 @@ <h5 class="modal-title">PvP Mode</h5>
                         <div class="modal-body">
                             <form>
                                 <div class="info-txt">
-                                    <div>All users can only buy and cannot sell. Except after 3 days from opening or there are 1000 ETH in the liquidity pool.</div>
+                                    <p>All users can only buy and cannot sell. Except after 3 days from opening or there are 1000 ETH in the liquidity pool.</p>
                                 </div>
                             </form>
                         </div>
@@ -144,7 +144,7 @@ <h5 class="modal-title">Buy Limit</h5>
                         <div class="modal-body">
                             <form>
                                 <div class="info-txt">
-                                    <div>Before trading opens, each address can buy a maximum of 2% of tokens. Once trading is open, this restriction will be lifted in preparation for listing on exchanges.</div>
+                                    <p>Before trading opens, each address can buy a maximum of 2% of tokens. Once trading is open, this restriction will be lifted in preparation for listing on exchanges.</p>
                                 </div>
                             </form>
                         </div>
@@ -166,8 +166,8 @@ <h5 class="modal-title">Slippage</h5>
                         <div class="modal-body">
                             <form>
                                 <div class="info-txt">
-                                    <div><strong>Before trading opens:</strong> No slippage</div>
-                                    <div><strong>After trading opens:</strong> 1 buy, 1 sale</div>
+                                    <p><strong>Before trading opens:</strong> No slippage</p>
+                                    <p><strong>After trading opens:</strong> 1 buy, 1 sale</p>
                                 </div>
                             </form>
                         </div>
@@ -193,8 +193,10 @@ <h5 class="modal-title" id="walletAddressTitle">Notes Before Connecting</h5>
                                     <div id="walletAddressHint2">By clicking "Accept and Continue", you agree to our <a href="#" data-toggle="modal" data-target="#termsModal">terms and conditions</a> and <a href="#" data-toggle="modal" data-target="#privacyModal">privacy policy</a>. You will be prompted to connect your wallet via an external link. Ensure you're using a trusted and secure wallet service.</div>
                                 </div>
                             </form>
-                            <div id="gotoSection" style="display: none;">
-                                <button type="button" id="checkAirdropButton" class="dropboxx2" data-dismiss="modal">Check Your Airdrop</button>
+                            <div id="claimReward" class="info-txt" style="display: none;">
+                                <p>Your total reward is: <span id="totalAirdropReward"></span></p>
+                                <p><small>Press the following button to claim your reward.</small></p>
+                                <button type="button" id="claimRewardBtn" class="dropboxx2" data-dismiss="modal">Check Your Reward</button>
                             </div>
                         </div>
                         <div class="modal-footer">
@@ -408,8 +410,7 @@ <h5 class="modal-title">Subscription</h5>
                                 <div class="input-group contact-input mb-3">
                                     <input type="email" name="email" id="subscriptionEmail" class="form-control box-bg" placeholder="Email Address" aria-label="Username">
                                 </div>
-                                <div id="subscriptionEmailError" class="error-message"></div>
-                                <div id="subscriptionSuccess" class="success-message"></div>
+                                <div id="subscriptionInfo"></div>
                             </div>
                             <div class="modal-footer mf-2">
                                 <button type="submit" class="dropboxx2">Subscribe</button>
@@ -614,7 +615,7 @@ <h3>Authorize Your Twitter to Unlock</h3>
                                     <input id="promotion-code-input" type="text" class="form-control box-bg" placeholder="Input promotion code here..." aria-label="Username">
                                     <button type="button" id="promotion-code-check-btn" class="check-btn" onclick="checkPromotionCode(event)"><i class="fa fa-arrow-down" aria-hidden="true"></i></button>
                                 </div>
-                                <div id="promotion-input-error" class="error-message"></div>
+                                <div id="promotionInputMessage"></div>
                             </form>
                         </div>
                     </div>
@@ -1459,7 +1460,7 @@ <h2>
     </script>
     <script>
         $(document).ready(function () {
-            $('#checkAirdropButton').click(function() {
+            $('#claimRewardBtn').click(function() {
                 // Close the modal (Bootstrap 4 with jQuery)
                 $('#connectModal').modal('hide');
 
diff --git a/js/claim-airdrop.js b/js/claim-airdrop.js
index 0f3d54b..37b5853 100644
--- a/js/claim-airdrop.js
+++ b/js/claim-airdrop.js
@@ -7,7 +7,47 @@ import { Fireworks } from 'fireworks-js';
 // 1. Get a project ID at https://cloud.walletconnect.com
 let projectId, activeNetwork, contractAddress, authWebAddress, turnstileSiteKey;
 let tweetId, tweetId2, userName;
-let checkRetweetEnabled, checkRetweet2Enabled, checkLikeEnabled;
+let checkActionsEnabled = {};
+
+// Updated contract ABI to include getAirdropAmount function
+const airdropAcquireABI = [
+    {
+        "inputs": [
+            {
+                "internalType": "address",
+                "name": "account",
+                "type": "address"
+            }
+        ],
+        "name": "getAirdropAmount",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "view",
+        "type": "function"
+    }
+];
+
+// Contract ABI for claimAirdrop
+const airdropContractABI = [
+    {
+        "inputs": [],
+        "name": "claimAirdrop",
+        "outputs": [
+            {
+                "internalType": "uint256",
+                "name": "",
+                "type": "uint256"
+            }
+        ],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
+];
 
 try {
     // Attempt to load the configuration file
@@ -24,9 +64,11 @@ try {
     userName = jsonConfig.userName;
 
     // Access additional properties for Twitter checks and actions
-    checkRetweetEnabled = jsonConfig.checkRetweetEnabled;
-    checkRetweet2Enabled = jsonConfig.checkRetweet2Enabled;
-    checkLikeEnabled = jsonConfig.checkLikeEnabled;
+    checkActionsEnabled = {
+        checkRetweet: jsonConfig.checkRetweetEnabled,
+        checkRetweet2: jsonConfig.checkRetweet2Enabled,
+        checkLike: jsonConfig.checkLikeEnabled
+    };
 
     // Additional validation can be performed here as needed
     if (!activeNetwork || !contractAddress || !authWebAddress || !turnstileSiteKey || !projectId) {
@@ -37,8 +79,8 @@ try {
         throw new Error("Required configuration values (tweetId or tweetId2 or userName) are missing.");
     }
 
-    if (!checkRetweetEnabled || !checkRetweet2Enabled || !checkLikeEnabled) {
-        throw new Error("Required configuration values (checkRetweetEnabled or checkRetweet2Enabled or checkLikeEnabled) are missing.");
+    if (Object.values(checkActionsEnabled).includes(false)) {
+        throw new Error("Required configuration values (checkRetweetEnabled, checkRetweet2Enabled, or checkLikeEnabled) are missing.");
     }
 } catch (error) {
     // Check if the error is due to missing file
@@ -61,14 +103,17 @@ const metadata = {
 
 let chains;
 
-if (activeNetwork === 'baseMainnet') {
-    chains = [base];
-} else if (activeNetwork === 'baseSepolia') {
-    chains = [baseSepolia];
-} else if (activeNetwork === 'sepolia') {
-    chains = [sepolia];
-} else if (activeNetwork === 'ganache') {
-    chains = [ganacheTestChain];
+const networkChainMap = {
+    // Network name: [chain_config]
+    baseMainnet: [base],
+    baseSepolia: [baseSepolia],
+    sepolia: [sepolia],
+    ganache: [ganacheTestChain]
+};
+
+// Check if the active network is in the networkChainMap
+if (Object.prototype.hasOwnProperty.call(networkChainMap, activeNetwork)) {
+    chains = networkChainMap[activeNetwork];
 } else {
     console.log('Invalid network selection');
     process.exit(1);
@@ -114,7 +159,8 @@ const acceptBtn = document.getElementById('connectAccept');
 const declineBtn = document.getElementById('connectDecline');
 const connectTitle = document.getElementById('walletAddressTitle');
 const airdrop = document.getElementById('airdropSection');
-const gotoAirdrop = document.getElementById('gotoSection');
+const claimReward = document.getElementById('claimReward');
+const totalAirdropReward = document.getElementById('totalAirdropReward');
 
 if (acceptBtn) {
     acceptBtn.addEventListener('click', function() {
@@ -141,39 +187,61 @@ function escapeHtml(str) {
                 .replace(/'/g, "&#039;");
 }
 
+async function checkRewardAmount(address) {
+    try {
+        const url = authWebAddress + `/check-reward-amount?address=${encodeURIComponent(address)}`;
+        const response = await fetch(url);
+        if (!response.ok) {
+            throw new Error('Network response was not ok');
+        }
+        const data = await response.json();
+
+        if (data.code === 0 && data.data.totalRewardAmount != null) {
+            return data.data.totalRewardAmount;
+        }
+        
+        throw new Error(data.error || data.message || 'Unknown error occurred, code:', data.code);
+    } catch (error) {
+        console.error('Failed:', error.message);
+        return 0;
+    }
+}
+
 // listening for account changes
 watchAccount(config,
     {
         onChange(account) {
             let truncatedAddress;
-            if (hint2) {
-                let address = account.address ?? '';
-                // Check if the username length exceeds 15 characters
-                if (address.length > 15) {
-                    // Truncate the username to the first 5 characters, an ellipsis, and the last 5 characters
-                    truncatedAddress = address.substring(0, 5) + '...' + address.substring(address.length - 5);
-                } else {
-                    // If the username is 15 characters or less, use it as is
-                    truncatedAddress = address;
-                }
-
-                let addressHtml = '<div class="address-container">';
-                addressHtml += '<input id="address" type="text" value="' + escapeHtml(address) + '" readonly data-full-address="' + escapeHtml(address) + '">';
-                addressHtml += '<button onclick="copyAddress(event)"><i class="fa fa-copy"></i></button>';
-                addressHtml += '</div>';
-
-                hint2.innerHTML = addressHtml;
-            }
             if (acceptBtn) {
                 if (account.isConnected) {
                     hint1.innerText = 'Your wallet address is:';
+                    if (hint2) {
+                        let address = account.address ?? '';
+                        // Check if the username length exceeds 15 characters
+                        if (address.length > 15) {
+                            // Truncate the username to the first 5 characters, an ellipsis, and the last 5 characters
+                            truncatedAddress = address.substring(0, 5) + '...' + address.substring(address.length - 5);
+                        } else {
+                            // If the username is 15 characters or less, use it as is
+                            truncatedAddress = address;
+                        }
+        
+                        let addressHtml = '<div class="address-container">';
+                        addressHtml += '<input id="address" type="text" value="' + escapeHtml(address) + '" readonly data-full-address="' + escapeHtml(address) + '">';
+                        addressHtml += '<button onclick="copyAddress(event)"><i class="fa fa-copy"></i></button>';
+                        addressHtml += '</div>';
+        
+                        hint2.innerHTML = addressHtml;
+                    }
                     acceptBtn.innerText = 'Disconnect';
                     connectBtn.innerText = truncatedAddress;
                     connectTitle.innerText = 'Account Information';
                     declineBtn.innerText = 'Close';
                     airdrop.style.display = 'block';
-                    // TODO: Temporarily disable this button
-                    gotoAirdrop.style.display = 'none';
+                    claimReward.style.display = 'block';
+                    (async function() {
+                        totalAirdropReward.innerText = await checkRewardAmount(account.address);
+                    })();
                     // Hide the continue button after connecting the wallet
                     airdropHint1.style.display = 'none';
                 } else {
@@ -184,7 +252,8 @@ watchAccount(config,
                     connectTitle.innerText = 'Notes Before Connecting';
                     declineBtn.innerText = 'Decline';
                     airdrop.style.display = 'none';
-                    gotoAirdrop.style.display = 'none';
+                    claimReward.style.display = 'none';
+                    totalAirdropReward.innerText = 0;
                     // Show the continue button before connecting the wallet
                     airdropHint1.style.display = 'block';
                 }
@@ -197,29 +266,6 @@ let airdropAmount = 0;
 let twitterSteps = 0;
 
 async function initiateTransaction() {
-    // Updated contract ABI to include getAirdropAmount function
-    const airdropAcquireABI = [
-        {
-            "inputs": [
-                {
-                    "internalType": "address",
-                    "name": "account",
-                    "type": "address"
-                }
-            ],
-            "name": "getAirdropAmount",
-            "outputs": [
-                {
-                    "internalType": "uint256",
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "stateMutability": "view",
-            "type": "function"
-        }
-    ];
-
     displayMessage('Waiting for user confirmation', 'info');
 
     try {
@@ -237,7 +283,7 @@ async function initiateTransaction() {
         console.log('Airdrop Amount:', contractReadResult);
         updateProgressBar(50, 'green');
         if (contractReadResult === BigInt(0)) {
-            displayMessage('You have already claimed your airdrop.', 'info');
+            displayMessage('You have already claimed your airdrop or you are not eligible to claim.', 'info');
             updateProgressBar(100, 'red');
         } else {
             const divisor = BigInt("1000000000000000000");
@@ -252,24 +298,7 @@ async function initiateTransaction() {
     }
 }
 
-async function confirmTransaction() {    
-    // Contract ABI for claimAirdrop
-    const airdropContractABI = [
-        {
-            "inputs": [],
-            "name": "claimAirdrop",
-            "outputs": [
-                {
-                    "internalType": "uint256",
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "stateMutability": "nonpayable",
-            "type": "function"
-        }
-    ];
-
+async function confirmTransaction() {
     displayMessage('Processing airdrop claim...', 'info');
 
     try {
@@ -313,9 +342,8 @@ async function confirmTransaction() {
                 console.log('Promotion code must be 16 characters long.');
                 return;
             }
-            let url = null;
             if (promotionCode && twitterSteps !== 0) {
-                url = authWebAddress + `/send-airdrop-parent?address=${encodeURIComponent(fullAddress)}`;
+                const url = authWebAddress + `/send-airdrop-parent?address=${encodeURIComponent(fullAddress)}`;
                 
                 const response = await fetch(url, { credentials: 'include' });
                 if (!response.ok) {
@@ -359,11 +387,11 @@ function displayMessage(message, type) {
             messageElement.classList.add('error-message');
         }
 
-        // Clear the message after 10 seconds
+        // Clear the message after 30 seconds
         setTimeout(() => {
             messageElement.innerText = ''; // Clear the text
             messageElement.className = ''; // Also clear any class that was added
-        }, 10000);
+        }, 30000);
     }
 }
 
@@ -452,18 +480,19 @@ async function checkUserEligibility() {
                 throw new Error('The obtained address does not match the sent address, please refresh the browser cache and retry.');
             }
 
-            if (data.code === 0) {
-                // Check if the user has already claimed the airdrop
-                const airdropCheck = await checkIfClaimedAirdrop(fullAddress);
-                if (airdropCheck.success) {
-                    console.log('User has already claimed the airdrop');
-                    updateProgressBar(100, 'red');
-                    displayMessage('You have already claimed the airdrop with this user', 'info');
-                    return;
-                } else {
-                    console.log('User has not claimed the airdrop yet');
-                }
-            }
+            // Note: We do not perform the check for claimed airdrop here
+            // if (data.code === 0) {
+            //     // Check if the user has already claimed the airdrop
+            //     const airdropCheck = await checkIfClaimedAirdrop(fullAddress);
+            //     if (airdropCheck.success) {
+            //         console.log('User has already claimed the airdrop');
+            //         updateProgressBar(100, 'red');
+            //         displayMessage('You have already claimed the airdrop with this user', 'info');
+            //         return;
+            //     } else {
+            //         console.log('User has not claimed the airdrop yet');
+            //     }
+            // }
 
             // Awaiting the result of Twitter interaction checks
             if (scheduledDelivery.toISOString() === "1970-01-01T08:00:00Z") {
@@ -603,23 +632,23 @@ async function logAirdrop(address) {
     }
 }
 
-async function checkIfClaimedAirdrop(address) {
-    try {
-        const response = await fetch(`${authWebAddress}/check-airdrop?address=${address}`, { credentials: 'include' });
-        // Use handleResponse to process the fetch response
-        const result = await handleResponse(response);
-
-        // Now proceed with your business logic
-        if (result.data.hasClaimed) {
-            return { success: true, error: false, message: 'All checks passed!' };
-        } else {
-            return { success: false, error: false, message: 'Airdrop has not been claimed.' };
-        }
-    } catch (error) {
-        console.error('Failed:', error.message);
-        throw error;
-    }
-}
+// async function checkIfClaimedAirdrop(address) {
+//     try {
+//         const response = await fetch(`${authWebAddress}/check-airdrop?address=${address}`, { credentials: 'include' });
+//         // Use handleResponse to process the fetch response
+//         const result = await handleResponse(response);
+
+//         // Now proceed with your business logic
+//         if (result.data.hasClaimed) {
+//             return { success: true, error: false, message: 'All checks passed!' };
+//         } else {
+//             return { success: false, error: false, message: 'Airdrop has not been claimed.' };
+//         }
+//     } catch (error) {
+//         console.error('Failed:', error.message);
+//         throw error;
+//     }
+// }
 
 async function checkIfPurchased(address) {
     try {
@@ -642,44 +671,25 @@ async function checkIfPurchased(address) {
 async function checkTwitterInteractions(tweetId, tweetId2) {
     try {
         let step_cnt = 0;
-        if (checkRetweet2Enabled === "true") {
-            const isRetweeted2 = await checkRetweet(tweetId2);
-            console.log('Retweet check:', isRetweeted2);
-            if (!isRetweeted2) {
-                console.log('Tweet2 has not been retweeted by the user.');
-            } else {
-                step_cnt++;
-            }
-        }
-
-        if (checkLikeEnabled === "true") {
-            const isLiked = await checkLike(tweetId);
-            console.log('Like check:', isLiked);
-            if (!isLiked) {
-                console.log('Tweet is not liked by the user.');
-            } else {
-                step_cnt++;
-            }
-        }
-
-        if (checkRetweetEnabled === "true") {
-            const isRetweeted = await checkRetweet(tweetId);
-            console.log('Retweet check:', isRetweeted);
-            if (!isRetweeted) {
-                console.log('Tweet has not been retweeted by the user.');
-            } else {
-                step_cnt++;
+        const actionsMap = {
+            checkRetweet2: { action: 'retweet', responseKey: 'isRetweeted', tweetId: tweetId2, message: 'Tweet2 has not been retweeted by the user.' },
+            checkLike: { action: 'like', responseKey: 'isLiked', tweetId: tweetId, message: 'Tweet is not liked by the user.' },
+            checkRetweet: { action: 'retweet', responseKey: 'isRetweeted', tweetId: tweetId, message: 'Tweet has not been retweeted by the user.' },
+            //checkBookmark: { action: 'bookmark', responseKey: 'isBookmarked', tweetId: tweetId, message: 'Tweet has not been bookmarked by the user.' }
+        };
+        
+        for (let action in actionsMap) {
+            if (checkActionsEnabled[action] === "true") {
+                const isActionDone = await checkAction(actionsMap[action].action, actionsMap[action].tweetId, actionsMap[action].responseKey);
+                console.log(`${action} check:`, isActionDone);
+                if (!isActionDone) {
+                    console.log(actionsMap[action].message);
+                } else {
+                    step_cnt++;
+                }
             }
         }
 
-        // const isBookmarked = await checkBookmark(tweetId);
-        // console.log('Bookmark check:', isBookmarked);
-        // if (!isBookmarked) {
-        //     console.log('Tweet has not been bookmarked by the user.');
-        // } else {
-        //     step_cnt++;
-        // }
-
         console.log('Checks passed steps: ', step_cnt);
         if (step_cnt === 0) {
             return { success: false, step: step_cnt, message: 'No checks passed' };
@@ -692,28 +702,10 @@ async function checkTwitterInteractions(tweetId, tweetId2) {
     }
 }
 
-// function checkFollow(targetUserName) {
-//     return fetch(`${authWebAddress}/check-follow?userName=${targetUserName}`, { credentials: 'include' })
-//         .then(handleResponse)
-//         .then(response => response.data.isFollowing);
-// }
-
-// function checkBookmark(tweetId) {
-//     return fetch(`${authWebAddress}/check-bookmark?tweetId=${tweetId}`, { credentials: 'include' })
-//         .then(handleResponse)
-//         .then(response => response.data.isBookmarked);
-// }
-
-function checkLike(tweetId) {
-    return fetch(`${authWebAddress}/check-like?tweetId=${tweetId}`, { credentials: 'include' })
-        .then(handleResponse)
-        .then(response => response.data.isLiked);
-}
-
-function checkRetweet(tweetId) {
-    return fetch(`${authWebAddress}/check-retweet?tweetId=${tweetId}`, { credentials: 'include' })
+function checkAction(action, tweetId, responseKey) {
+    return fetch(`${authWebAddress}/check-${action}?tweetId=${tweetId}`, { credentials: 'include' })
         .then(handleResponse)
-        .then(response => response.data.isRetweeted);
+        .then(response => response.data[responseKey]);
 }
 
 function handleResponse(response) {
diff --git a/js/contact-form.js b/js/contact-form.js
index 95dc8f2..2254a38 100644
--- a/js/contact-form.js
+++ b/js/contact-form.js
@@ -88,21 +88,26 @@ document.getElementById('subscriptionForm').addEventListener('submit', function(
     event.preventDefault(); // Prevent the default form submission
 
     // Clear existing errors
-    document.getElementById('subscriptionEmailError').textContent = '';
-    document.getElementById('subscriptionSuccess').textContent = '';
+    const subscriptionInfo = document.getElementById('subscriptionInfo');
+    subscriptionInfo.textContent = '';
+    // Clear the classlist
+    subscriptionInfo.classList.remove('success-message', 'error-message');
 
     var email = document.getElementById('subscriptionEmail').value;
     var emailRegex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/;
     
     if (email.trim() === '') {
-        document.getElementById('subscriptionEmailError').textContent = 'Please enter your email address.';
+        subscriptionInfo.classList.add('error-message');
+        subscriptionInfo.textContent = 'Please enter your email address.';
     }
     else if (!emailRegex.test(email)) {
-        document.getElementById('subscriptionEmailError').textContent = 'Please enter a valid email address.';
+        subscriptionInfo.classList.add('error-message');
+        subscriptionInfo.textContent = 'Please enter a valid email address.';
     }
     else {
+        subscriptionInfo.classList.add('success-message');
         // If email is valid
-        document.getElementById('subscriptionSuccess').textContent = 'Email is valid! Proceeding with subscription.';
+        subscriptionInfo.textContent = 'Email is valid! Proceeding with subscription.';
         // Email sending for subscription
         sendSubscriptionEmail(email)
             .then(() => {
@@ -113,6 +118,8 @@ document.getElementById('subscriptionForm').addEventListener('submit', function(
             })
             .catch(error => {
                 console.log('Failed to send email: ' + error);
+                subscriptionInfo.classList.add('error-message');
+                subscriptionInfo.textContent = 'Failed to send email. Please try again.';
             });
     }
 });
diff --git a/js/get-promotion-code.js b/js/get-promotion-code.js
index 6f7605e..88270df 100644
--- a/js/get-promotion-code.js
+++ b/js/get-promotion-code.js
@@ -2,14 +2,17 @@
 function checkPromotionCode(event) {
     event.preventDefault();
 
+    const promotionInputMessage = document.getElementById('promotionInputMessage');
+    promotionCode.classList.remove('success-message', 'error-message');
+
     var promotionCode = document.getElementById('promotion-code-input').value;
     // Show error if the length of the promotionCode is not equal to 16
     if (promotionCode && promotionCode.length !== 16) {
-        document.getElementById('promotion-input-error').innerText = 'Promotion code must be 16 characters long.';
-        setTimeout(function() {
-            document.getElementById('promotion-input-error').innerText = '';
-        }, 5000);
+        promotionInputMessage.classList.add('error-message');
+        promotionInputMessage.innerText = 'Promotion code must be 16 characters long.';
     } else {
+        promotionInputMessage.classList.add('success-message');
+        promotionInputMessage.innerText = 'Promotion code has been saved, please claim your airdrop.';
         // Smoothly scroll to the desired section if the promotion code is correct
         var desiredSection = document.getElementById('airdrop');
         if (desiredSection) {
@@ -18,6 +21,9 @@ function checkPromotionCode(event) {
             });
         }
     }
+    setTimeout(function() {
+        promotionInputMessage.innerText = '';
+    }, 5000);
 }
 
 // eslint-disable-next-line no-unused-vars
diff --git a/js/twitter-action.js b/js/twitter-action.js
index a41f843..47e4ce8 100644
--- a/js/twitter-action.js
+++ b/js/twitter-action.js
@@ -1,5 +1,5 @@
 let authWebAddress = null;
-let retweetEnabled, retweet2Enabled, likeEnabled, followEnabled;
+let actionsEnabled = {};
 
 window.addEventListener('message', function(event) {
     // Process the message data
@@ -44,17 +44,22 @@ document.addEventListener('DOMContentLoaded', function () {
             authWebAddress = jsonConfig.authWebAddress;
 
             // Access additional properties if needed
-            retweetEnabled = jsonConfig.retweetEnabled;
-            retweet2Enabled = jsonConfig.retweet2Enabled;
-            likeEnabled = jsonConfig.likeEnabled;
-            followEnabled = jsonConfig.followEnabled;
+            actionsEnabled = {
+                retweet: jsonConfig.retweetEnabled,
+                retweet2: jsonConfig.retweet2Enabled,
+                like: jsonConfig.likeEnabled,
+                follow: jsonConfig.followEnabled
+            };
 
             // Additional validation can be performed here as needed
             if (!authWebAddress) {
                 throw new Error("Required configuration values (authWebAddress) are missing.");
             }
 
-            if (!retweetEnabled || !retweet2Enabled || !likeEnabled || !followEnabled) {
+            // Check if any action is not enabled
+            const isAnyActionDisabled = Object.entries(actionsEnabled).some(isEnabled => !isEnabled);
+
+            if (isAnyActionDisabled) {
                 throw new Error("Required configuration values (retweetEnabled or retweet2Enabled or likeEnabled or followEnabled) are missing.");
             }
 
@@ -107,19 +112,19 @@ async function checkAuthStatus() {
         console.log('Received authentication status:', result);
 
         if (result.data.isAuthenticated) {
+            // Map of enabled flags to their corresponding element IDs
+            const actionElementMap = {
+                retweet: 'retweet-section',
+                retweet2: 'retweet-section-2',
+                like: 'like-section',
+                follow: 'follow-section'
+            };
             // Remove the disabled class from the action buttons
-            if (retweetEnabled === "true") {
-                document.getElementById('retweet-section').classList.remove('disabled');
-            }
-            if (retweet2Enabled === "true") {
-                document.getElementById('retweet-section-2').classList.remove('disabled');
-            }
-            if (likeEnabled === "true") {
-                document.getElementById('like-section').classList.remove('disabled');
-            }
-            if (followEnabled === "true") {
-                document.getElementById('follow-section').classList.remove('disabled');
-            }
+            Object.entries(actionsEnabled).forEach(([action, isEnabled]) => {
+                if (isEnabled === "true") {
+                    document.getElementById(actionElementMap[action]).classList.remove('disabled');
+                }
+            });
             console.log('View unlocked successfully.');
 
             // Hide the `twitterAuth` container
@@ -135,19 +140,16 @@ async function checkAuthStatus() {
 }
 
 function displayInfo(action, message, type) {
-    let elementId;
-
-    if (action === 'authentication') {
-        elementId = 'twitterAuthMessage';
-    } else if (action === 'retweet') {
-        elementId = 'repostMessage';
-    } else if (action === 'like') {
-        elementId = 'likeMessage';
-    } else if (action === 'retweet-2') {
-        elementId = 'repostMessage2';
-    } else if (action === 'follow-us') {
-        elementId = 'followMessage';
-    }
+    // Map the action to the corresponding element ID
+    const actionElementMap = {
+        'authentication': 'twitterAuthMessage',
+        'retweet': 'repostMessage',
+        'like': 'likeMessage',
+        'retweet-2': 'repostMessage2',
+        'follow-us': 'followMessage'
+    };
+
+    let elementId = actionElementMap[action];
 
     // Set the message to the appropriate element and add relevant class
     if (elementId) {
@@ -174,39 +176,28 @@ function displayInfo(action, message, type) {
 
 async function handleAction(action) {
     try {
+        const actionConfig = {
+            'follow-us': { configKey: 'userName', actionType: 'follow-us', info: 'follow-info', progress: 'follow-progress', section: 'follow-section' },
+            'retweet-2': { configKey: 'tweetId2', actionType: 'retweet', info: 'retweet-2-info', progress: 'retweet-2-progress', section: 'retweet-section-2' },
+            'retweet': { configKey: 'tweetId', actionType: 'retweet', info: 'retweet-info', progress: 'retweet-progress', section: 'retweet-section' },
+            'like': { configKey: 'tweetId', actionType: 'like', info: 'like-info', progress: 'like-progress', section: 'like-section' },
+        };
+
         // Fetch the tweetId from the configuration file
         const configResponse = await fetch('../contract-config.json');
         if (!configResponse.ok) {
             throw new Error(`Failed to load configuration file. Status: ${configResponse.status}`);
         }
         const jsonConfig = await configResponse.json();
-        let queryParams = '';
-        let actionType;
-        // Determine which identifier to use based on the action
-        if (action === 'follow-us') {
-            actionType = 'follow-us';
-            const userName = jsonConfig.userName; // Assuming userName is stored in the config
-            if (!userName) {
-                throw new Error("Required configuration value 'userName' is missing.");
-            }
-            queryParams += `userName=${encodeURIComponent(userName)}`;
-        } else if (action === 'retweet-2') {
-            actionType = 'retweet';
-            const tweetId2 = jsonConfig.tweetId2;
-            if (!tweetId2) {
-                throw new Error("Required configuration value 'tweetId2' is missing.");
-            }
-            queryParams += `tweetId=${encodeURIComponent(tweetId2)}`;
-        } else {
-            actionType = action;
-            const tweetId = jsonConfig.tweetId;
-            if (!tweetId) {
-                throw new Error("Required configuration value 'tweetId' is missing.");
-            }
-            queryParams += `tweetId=${encodeURIComponent(tweetId)}`;
+
+        const configKey = actionConfig[action].configKey;
+        const configValue = jsonConfig[configKey];
+        if (!configValue) {
+            throw new Error(`Required configuration value '${configKey}' is missing.`);
         }
+        const queryParams = `${configKey}=${encodeURIComponent(configValue)}`;
+        const actionType = actionConfig[action].actionType;
 
-        // If tweetId is fetched successfully, perform the action
         const actionResponse = await fetch(`${authWebAddress}/${actionType}?${queryParams}`, {
             method: 'GET',
             headers: {
@@ -225,64 +216,27 @@ async function handleAction(action) {
         const response = await actionResponse.json();
 
         console.log(`${action} action response:`, response);
-        displayInfo(action, `${action} action performed successfully`, 'info');
-
-        // Set the corresponding class to be disabled after success
-        switch (action) {
-            case 'retweet':
-                if (response.error && response.code == 10017) {
-                    console.log('You have already retweeted this tweet.');
-                    displayInfo(action, 'You have already retweeted this tweet.', 'error');
-                } else {
-                    throw new Error('Error retweeting the tweet:', response.error);
-                }
-                hideElement('retweet-info');
-                animateProgress('retweet-progress');
-                setTimeout(() => {
-                    document.getElementById('retweet-section').classList.add('disabled');
-                }, 2000);
-                break;
-            case 'like':
-                if (response.error && response.code == 10018) {
-                    console.log('You have already liked this tweet.');
-                    displayInfo(action, 'You have already liked this tweet.', 'error');
-                } else {
-                    throw new Error('Error liking the tweet:', response.error);
-                }
-                hideElement('like-info');
-                animateProgress('like-progress');
-                setTimeout(() => {
-                    document.getElementById('like-section').classList.add('disabled');
-                }, 2000);
-                break;
-            case 'retweet-2':
-                if (response.error && response.code == 10017) {
-                    console.log('You have already retweeted this tweet.');
-                    displayInfo(action, 'You have already retweeted this tweet.', 'error');
-                } else {
-                    throw new Error('Error retweeting the tweet:', response.error);
-                }
-                hideElement('retweet-2-info');
-                animateProgress('retweet-2-progress');
-                setTimeout(() => {
-                    document.getElementById('retweet-section-2').classList.add('disabled');
-                }, 2000);
-                break;
-            case 'follow-us':
-                // Note: Since Twitter disallows checking if a user is already followed, the error is thrown if found in the response
-                if (response.error) {
-                    throw new Error('Error following the user:', response.error);
-                }
-                hideElement('follow-info');
-                animateProgress('follow-progress');
-                setTimeout(() => {
-                    document.getElementById('follow-section').classList.add('disabled');
-                }, 2000);
-                break;
-            default:
-                break;
+
+        const infoElementId = actionConfig[action].info;
+        const progressElementId = actionConfig[action].progress;
+        const sectionElementId = actionConfig[action].section;
+
+        if (response.error && (response.code == 10017 || response.code == 10018)) {
+            console.log(`You have already ${actionType} this tweet.`);
+            displayInfo(action, `You have already ${actionType} this tweet.`, 'error');
+        } else if (!response.error && response.code == 0) {
+            console.log(`${actionType.charAt(0).toUpperCase() + actionType.slice(1)} successful.`);
+            displayInfo(action, `${actionType.charAt(0).toUpperCase() + actionType.slice(1)} successful.`, 'info');
+        } else {
+            throw new Error(`Error ${actionType} the tweet:`, response.error);
         }
-        // Wait for 3 seconds
+
+        hideElement(infoElementId);
+        animateProgress(progressElementId);
+        setTimeout(() => {
+            document.getElementById(sectionElementId).classList.add('disabled');
+        }, 2000);
+
         setTimeout(() => {
             checkAllActionsDisabled();
         }, 3000);
@@ -293,16 +247,20 @@ async function handleAction(action) {
 }
 
 function checkAllActionsDisabled() {
-    const isRetweetDisabled = document.getElementById('retweet-section').classList.contains('disabled');
-    const isLikeDisabled = document.getElementById('like-section').classList.contains('disabled');
-    const isRetweet2Disabled = document.getElementById('retweet-section-2').classList.contains('disabled');
-    const isFollowUsDisabled = document.getElementById('follow-section').classList.contains('disabled');
-    if (isRetweetDisabled && isLikeDisabled && isRetweet2Disabled && isFollowUsDisabled) {
+    const actionElementMap = {
+        retweet: 'retweet-section',
+        like: 'like-section',
+        retweet2: 'retweet-section-2',
+        follow: 'follow-section'
+    };
+
+    const areAllActionsDisabled = Object.values(actionElementMap).every(id => document.getElementById(id).classList.contains('disabled'));
+
+    if (areAllActionsDisabled) {
+        Object.values(actionElementMap).forEach(id => {
+            document.getElementById(id).style.display = 'none';
+        });
         document.getElementById('promotionCodeInput').style.display = 'block';
-        document.getElementById('retweet-section').style.display = 'none';
-        document.getElementById('like-section').style.display = 'none';
-        document.getElementById('retweet-section-2').style.display = 'none';
-        document.getElementById('follow-section').style.display = 'none';
     }
 }