diff --git a/contents/css-questions.md b/contents/css-questions.md
index 000dd0224..c19a01349 100644
--- a/contents/css-questions.md
+++ b/contents/css-questions.md
@@ -5,7 +5,7 @@ sidebar_label: CSS questions
 
 :::info We are now part of GreatFrontEnd!
 
-Front End Interview Handbook is now part of [GreatFrontEnd](https://www.greatfrontend.com?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook)! We are working to migrate the content over and you may find the latest version of this page on [GreatFrontEnd](https://www.greatfrontend.com/front-end-interview-guidebook/quiz?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook).
+Front End Interview Handbook is now part of [GreatFrontEnd](https://www.greatfrontend.com?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook)! We are working to migrate the content over and you may find the latest version of this page on [GreatFrontEnd](https://www.greatfrontend.com/questions/css/quiz?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook).
 
 :::
 
diff --git a/contents/html-questions.md b/contents/html-questions.md
index f55c1db89..cbd826f30 100644
--- a/contents/html-questions.md
+++ b/contents/html-questions.md
@@ -5,7 +5,7 @@ sidebar_label: HTML questions
 
 :::info We are now part of GreatFrontEnd!
 
-Front End Interview Handbook is now part of [GreatFrontEnd](https://www.greatfrontend.com?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook)! We are working to migrate the content over and you may find the latest version of this page on [GreatFrontEnd](https://www.greatfrontend.com/front-end-interview-guidebook/quiz?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook).
+Front End Interview Handbook is now part of [GreatFrontEnd](https://www.greatfrontend.com?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook)! We are working to migrate the content over and you may find the latest version of this page on [GreatFrontEnd](https://www.greatfrontend.com/questions/html/quiz?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook).
 
 :::
 
diff --git a/contents/javascript-questions.md b/contents/javascript-questions.md
index b5e29b745..0fb181ce7 100644
--- a/contents/javascript-questions.md
+++ b/contents/javascript-questions.md
@@ -5,7 +5,7 @@ sidebar_label: JavaScript questions
 
 :::info We are now part of GreatFrontEnd!
 
-Front End Interview Handbook is now part of [GreatFrontEnd](https://www.greatfrontend.com?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook)! We are working to migrate the content over and you may find the latest version of this page on [GreatFrontEnd](https://www.greatfrontend.com/front-end-interview-guidebook/quiz?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook).
+Front End Interview Handbook is now part of [GreatFrontEnd](https://www.greatfrontend.com?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook)! We are working to migrate the content over and you may find the latest version of this page on [GreatFrontEnd](https://www.greatfrontend.com/questions/js/quiz?utm_source=frontendinterviewhandbook&utm_medium=referral&gnrs=frontendinterviewhandbook).
 
 :::
 
@@ -1389,4 +1389,5 @@ Static class members (properties/methods) are not tied to a specific instance of
 
 ### Other Answers
 
+- https://github.com/sudheerj/javascript-interview-questions
 - http://flowerszhong.github.io/2013/11/20/javascript-questions.html
diff --git a/website/src/components/SidebarAd/index.js b/website/src/components/SidebarAd/index.js
index 1ea60e713..c19a90cc7 100644
--- a/website/src/components/SidebarAd/index.js
+++ b/website/src/components/SidebarAd/index.js
@@ -34,7 +34,7 @@ function GreatFrontEnd({ position }) {
   return (
     <a
       className={clsx(styles.container, styles.backgroundPurple)}
-      href={`https://www.greatfrontend.com?utm_source=frontendinterviewhandbook&utm_medium=referral&utm_content=${position}&fpr=frontendinterviewhandbook`}
+      href={`https://www.greatfrontend.com?utm_source=frontendinterviewhandbook&utm_medium=referral&utm_content=${position}&gnrs=frontendinterviewhandbook`}
       target="_blank"
       rel="noopener"
       onClick={() => {
diff --git a/website/src/pages/index.js b/website/src/pages/index.js
index 0b45593a4..b376d7b8d 100755
--- a/website/src/pages/index.js
+++ b/website/src/pages/index.js
@@ -101,7 +101,7 @@ function GreatFrontEndSection() {
                 <div className="margin-vert--md">
                   <a
                     className="button button--secondary button--lg"
-                    href="https://www.greatfrontend.com/prepare?fpr=yangshun"
+                    href="https://www.greatfrontend.com/prepare?gnrs=frontendinterviewhandbook"
                     rel="noopener"
                     target="_blank"
                     onClick={() => {
@@ -129,21 +129,15 @@ function GreatFrontEndSection() {
             <div className="row">
               <div className={clsx('col col--4', styles.flexContainer)}>
                 <RiPresentationLine className={styles.promoIcon} />
-                <p className={styles.whiteText}>
-                  Well-explained solutions
-                </p>
+                <p className={styles.whiteText}>Well-explained solutions</p>
               </div>
               <div className={clsx('col col--4', styles.flexContainer)}>
                 <RiBookOpenLine className={styles.promoIcon} />
-                <p className={styles.whiteText}>
-                  Step-by-step study plans
-                </p>
+                <p className={styles.whiteText}>Step-by-step study plans</p>
               </div>
               <div className={clsx('col col--4', styles.flexContainer)}>
                 <RiStackLine className={styles.promoIcon} />
-                <p className={styles.whiteText}>
-                  Structured 4-stage process
-                </p>
+                <p className={styles.whiteText}>Structured 4-stage process</p>
               </div>
             </div>
           </div>