diff --git a/component/layout/SectionEvents/SectionEvents.jsx b/component/layout/SectionEvents/SectionEvents.jsx
index 4e74f95c..f85c0a6d 100644
--- a/component/layout/SectionEvents/SectionEvents.jsx
+++ b/component/layout/SectionEvents/SectionEvents.jsx
@@ -18,20 +18,28 @@ export default function SectionEvents({ events }) {
           </div>
         </Fade>
         <div className={styles.event}>
-          <figure>
-            <Image
-              src={events?.banner_image ? events.banner_image : '/'}
-              alt=""
-              width={978}
-              height={539}
-            />
-            <figcaption>
-              <h3>
-                <span>{events?.title}</span>
-              </h3>
-              <p>{events?.event_time && moment(events?.event_time).format("MMMM Do YYYY, h:mm a")}</p>
-            </figcaption>
-          </figure>
+          {events?.length > 0 ? (
+            <figure>
+              <Image
+                src={events?.banner_image ? events.banner_image : "/"}
+                alt=""
+                width={978}
+                height={539}
+              />
+              <figcaption>
+                <h3>
+                  <span>{events?.title}</span>
+                </h3>
+                <p>
+                  {moment(events?.event_time).format("MMMM Do YYYY, h:mm a")}
+                </p>
+              </figcaption>
+            </figure>
+          ) : (
+            <div className="flex items-center justify-center m-9 font-semibold">
+              There's no events yet!
+            </div>
+          )}
         </div>
       </div>
     </section>
diff --git a/component/layout/SectionVideos/SectionVideos.jsx b/component/layout/SectionVideos/SectionVideos.jsx
index 37bfa61b..16fe0463 100644
--- a/component/layout/SectionVideos/SectionVideos.jsx
+++ b/component/layout/SectionVideos/SectionVideos.jsx
@@ -11,13 +11,13 @@ export default function SectionVideos() {
             <div className={styles.videoItem}>
               <figure>
                 <Image
-                  src="/images/temp/video1.png"
+                  src="/images/temp/yvideo2.png"
                   alt="Video1"
                   width={432}
                   height={586}
                   layout="responsive"
                 />
-                <a href="/" className={styles.play}>
+                <a href="https://www.youtube.com/watch?v=EL6F9h7UgUA" className={styles.play}>
                   <svg
                     width="151"
                     height="104"
@@ -43,7 +43,7 @@ export default function SectionVideos() {
                 </a>
                 <figcaption>
                   <h3>
-                    <a href="/">All you need to know about Supabase</a>
+                    <a href="/">What is (Simple Notification Service) SNS? | Nullcast</a>
                   </h3>
                 </figcaption>
               </figure>
@@ -52,13 +52,13 @@ export default function SectionVideos() {
             <div className={styles.videoItem}>
               <figure>
                 <Image
-                  src="/images/temp/video2.png"
+                  src="/images/temp/yvideo1.png"
                   alt="Video2"
                   width={432}
                   height={586}
                   layout="responsive"
                 />
-                <a href="/" className={styles.play}>
+                <a href="https://m.youtube.com/watch?v=XcSKzYaBV3c" className={styles.play}>
                   <svg
                     width="151"
                     height="104"
@@ -83,7 +83,7 @@ export default function SectionVideos() {
                   </svg>
                 </a>
                 <figcaption>
-                  <h3>All you need to know about Supabase</h3>
+                  <h3>What is Zapier?</h3>
                 </figcaption>
               </figure>
             </div>
@@ -91,13 +91,13 @@ export default function SectionVideos() {
             <div className={styles.videoItem}>
               <figure>
                 <Image
-                  src="/images/temp/video3.png"
+                  src="/images/temp/yvideo3.png"
                   alt="Video3"
                   width={432}
                   height={586}
                   layout="responsive"
                 />
-                <a href="/" className={styles.play}>
+                <a href="https://m.youtube.com/watch?v=YP48OZtsOpU" className={styles.play}>
                   <svg
                     width="151"
                     height="104"
@@ -122,7 +122,7 @@ export default function SectionVideos() {
                   </svg>
                 </a>
                 <figcaption>
-                  <h3>All you need to know about Supabase</h3>
+                  <h3>IoT Communication Protocol | Nullcast</h3>
                 </figcaption>
               </figure>
             </div>
diff --git a/public/images/temp/video1.png b/public/images/temp/video1.png
deleted file mode 100644
index 8b14be30..00000000
Binary files a/public/images/temp/video1.png and /dev/null differ
diff --git a/public/images/temp/video2.png b/public/images/temp/video2.png
deleted file mode 100644
index defe106e..00000000
Binary files a/public/images/temp/video2.png and /dev/null differ
diff --git a/public/images/temp/video3.png b/public/images/temp/video3.png
deleted file mode 100644
index c8042ff4..00000000
Binary files a/public/images/temp/video3.png and /dev/null differ
diff --git a/public/images/temp/yvideo1.png b/public/images/temp/yvideo1.png
new file mode 100644
index 00000000..cfc0c474
Binary files /dev/null and b/public/images/temp/yvideo1.png differ
diff --git a/public/images/temp/yvideo2.png b/public/images/temp/yvideo2.png
new file mode 100644
index 00000000..3f053e2c
Binary files /dev/null and b/public/images/temp/yvideo2.png differ
diff --git a/public/images/temp/yvideo3.png b/public/images/temp/yvideo3.png
new file mode 100644
index 00000000..4b52be7c
Binary files /dev/null and b/public/images/temp/yvideo3.png differ