diff --git a/package.json b/package.json
index 5d4011d..0376a63 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build && mv ./dist/2021/* ./dist && rm -rf 2021",
+    "build": "vue-cli-service build && mv ./dist/2021/* ./dist && rm -rf 2021 && mv ./dist/app.html ./dist/index.html",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
@@ -34,4 +34,4 @@
     "vue-cli-plugin-prerender-spa": "~1.1.6",
     "vue-template-compiler": "^2.6.11"
   }
-}
+}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 72ec4a8..c9c50d9 100644
--- a/public/index.html
+++ b/public/index.html
@@ -13,10 +13,11 @@
   <meta property="og:site_name" content="SITCON 2021 學生計算機年會 | Students' Information Technology Conference" />
   <link rel="icon" href="<%= BASE_URL %>sitcon-logo.png">
   <title>SITCON 學生計算機年會 2021</title>
+  <noscript>{{{ %GA_TEMPLATE% }}}</noscript>
 </head>
 
 <body>
-  <noscript>{{{ %GA_TEMPLATE% }}}</noscript>
+
   <noscript>
     <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
         Please enable it to continue.</strong>
diff --git a/src/components/CFP/Intro.vue b/src/components/CFP/Intro.vue
index 051cb43..f837dff 100644
--- a/src/components/CFP/Intro.vue
+++ b/src/components/CFP/Intro.vue
@@ -16,8 +16,8 @@
             <!-- src="@/assets/images/cfp/Background.svg" -->
             <!-- first part -->
             <img src="@/assets/images/cfp/Path 740.svg" class="SITCON-text-path"/>
-            <svg width="890" height="900" class="first-box">
-              <rect width="1000" height="1000" style="fill:#ffffff;" />
+            <svg width="1200" height="1000" class="first-box">
+              <rect width="1200" height="1000" style="fill:#ffffff;" />
             </svg>
             <div class="box-back">
                 <h1>關於 SITCON</h1>
diff --git a/src/components/news/Header.vue b/src/components/news/Header.vue
index a4b8e1a..240ce2a 100644
--- a/src/components/news/Header.vue
+++ b/src/components/news/Header.vue
@@ -2,7 +2,7 @@
   <header>
     <div class="top-bar">
       <div class="return-wrapper">
-        <a class="shape-wrapper diamond" href="/cfp"
+        <a class="shape-wrapper diamond" href="/2021/cfp"
           ><span class="text-wrapper">返回</span></a
         >
       </div>
diff --git a/src/router/index.ts b/src/router/index.ts
index d9f00c0..27050d5 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,7 +10,7 @@ export const routes: RouteConfig[] = [
   {
     path: '/',
     name: 'Home',
-    redirect: '/cfp',
+    component: CFP,
     meta: {
       index: 0,
       label: 'SITCON 2021',
diff --git a/template/ga.html b/template/ga.html
index 66fae17..3e4411a 100644
--- a/template/ga.html
+++ b/template/ga.html
@@ -36,21 +36,12 @@
     "offers": [
       {
       "@type": "Offer",
-        "name": "個人贊助票",
+        "name": "個人小額贊助方案",
         "url": "https://sitcon.kktix.cc/events/sitcon2020-individual-sponsor",
-        "price": "1000",
-        "priceCurrency": "TWD",
-        "availability": "http://schema.org/InStock",
-        "validFrom": "2019-10-14T00:00+08:00"
-      },
-      {
-      "@type": "Offer",
-        "name": "個人贊助票（純粹贊助）",
-        "url": "https://sitcon.kktix.cc/events/sitcon2021-individual-sponsor1",
         "price": "500",
         "priceCurrency": "TWD",
         "availability": "http://schema.org/InStock",
-        "validFrom": "2019-10-14T00:00+08:00"
+        "validFrom": "2020-12-01T00:00+08:00"
       }
     ],
     "performer": {
@@ -64,8 +55,7 @@
         "https://twitter.com/sitcontw"
       ]
     },
-    "eventStatus": "EventRescheduled",
-    "previousStartDate": "2021-05-29T08:30+08:00"
+    "eventStatus": "EventScheduled"
   }
 </script>
 <script>
@@ -95,4 +85,4 @@
     }
     gtag('js', new Date());
     gtag('config', 'UA-34467841-1');
-</script>
\ No newline at end of file
+</script>
