diff --git a/src/components/blocks/CommunityLinks.astro b/src/components/blocks/CommunityLinks.astro
index 5d797fb..a541ec6 100644
--- a/src/components/blocks/CommunityLinks.astro
+++ b/src/components/blocks/CommunityLinks.astro
@@ -8,29 +8,6 @@ const editUrl = `${baseRepoUrl}${path}`;
 ---
 
 <ul class="list-none text-sm">
-	<!-- <li class="ml-[0.5rem] my-2">
-		<a
-			href={`https://github.com/liyunze-coding/coworking-website/edit/main/src/pages${currentUrl}`}
-			class="inline-flex gap-2 transition-colors duration-150 text-white hover:no-underline hover:text-blue-400"
-		>
-			<svg
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				stroke-width="1.5"
-				stroke="currentColor"
-				class="w-6 h-6"
-			>
-				<path
-					stroke-linecap="round"
-					stroke-linejoin="round"
-					d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10"
-				></path>
-			</svg>
-
-			Edit this page</a
-		>
-	</li> -->
 	<li class="ml-[0.5rem] my-2">
 		<a
 			href="https://rython.dev/discord"
diff --git a/src/pages/get-started/_images/introduction/coworking_study_category.webp b/src/pages/get-started/_images/introduction/coworking_study_category.webp
new file mode 100644
index 0000000..9e1b490
Binary files /dev/null and b/src/pages/get-started/_images/introduction/coworking_study_category.webp differ
diff --git a/src/pages/get-started/introduction.mdx b/src/pages/get-started/introduction.mdx
index 11d2f41..84b66c5 100644
--- a/src/pages/get-started/introduction.mdx
+++ b/src/pages/get-started/introduction.mdx
@@ -9,6 +9,8 @@ import { Image } from 'astro:assets';
 import RythonDev from "./_images/introduction/rythondev.webp";
 import Ellyskey from "./_images/introduction/ellyskey.webp";
 import Seiji from "./_images/introduction/seiji.webp";
+import MultiTaskWidget from "./../guide/_images/widgets/multitask.webp";
+import CoworkingCategory from "./_images/introduction/coworking_study_category.webp";
 
 # Introduction
 
@@ -82,7 +84,9 @@ Ultimately, co-working streams cater to a specific need for some viewers. They o
 
 ## What is a task widget?
 
-<a href="../guide/stream-widgets#task-widgets" class="no-target-blank"><img src="/images/widgets/multitask.webp" alt="Multi Task Widget" loading="lazy" /></a>
+<a href="../guide/stream-widgets#task-widgets" class="no-target-blank">
+<Image src={MultiTaskWidget} alt="Multi task widget" width="300" loading="lazy" />
+</a>
 
 If you want to add a task widget to your own stream, check it out in the <a href="../guide/stream-widgets#task-widgets" class="no-target-blank">Widgets section</a>!
 
@@ -96,6 +100,10 @@ Task widgets offer an extra layer of accountability for the streamer and chatter
 
 Recently, Twitch has introduced the official Co-working & Studying category! 
 
+<a href="https://www.twitch.tv/directory/category/co-working-and-studying" target="_blank" class="no-target-blank">
+<Image src={CoworkingCategory} alt="Multi task widget" width="300" loading="lazy" />
+</a>
+
 - [Co-working & Studying category](https://www.twitch.tv/directory/category/co-working-and-studying)
 
 You can find other co-working or study streams with these tags too! 
diff --git a/src/pages/groups/index.mdx b/src/pages/groups/index.mdx
index b598922..be20367 100644
--- a/src/pages/groups/index.mdx
+++ b/src/pages/groups/index.mdx
@@ -17,7 +17,7 @@ Communities provide a great way to connect with other streamers and viewers!
 
 ---
 
-<a href="https://www.twitch.tv/team/coworkingcrew/">
+<a href="https://www.twitch.tv/team/coworkingcrew/" target="_blank">
     <Image src={CoworkingCrew} alt="Coworking Crew" width="400" height="143" loading="eager" />
 </a>
 
@@ -28,7 +28,7 @@ The Coworking Crew is a group of co-working streamers who aim to create supporti
 ---
 
 
-<a href="https://www.youthversity.org/">
+<a href="https://www.youthversity.org/" target="_blank">
     <Image src={YOUthversity} alt="YOUthversity" width="400" height="143" loading="lazy" />
 </a>
 
@@ -38,7 +38,7 @@ YOUthversity is not only an online space to study together but is dedicated to t
 
 ---
 
-<a href="https://studytme.com/">
+<a href="https://studytme.com/" target="_blank">
     <Image src={CEOgang} alt="CEO gang" width="400" height="143" loading="lazy" />
 </a>
 
@@ -49,7 +49,7 @@ The right place for ambitious people working together and supporting each other!
 ---
 
 
-<a href="https://erudita.me/">
+<a href="https://erudita.me/" target="_blank">
     <Image src={Erudita} alt="Erudita" width="400" height="143" loading="lazy"  />
 </a>
 
diff --git a/src/pages/guide/music-and-audio.mdx b/src/pages/guide/music-and-audio.mdx
index 8f460dd..b91a8cd 100644
--- a/src/pages/guide/music-and-audio.mdx
+++ b/src/pages/guide/music-and-audio.mdx
@@ -88,7 +88,7 @@ Streaming audio from Spotify to streaming services such as Twitch is against Spo
 
 ### [6K Labs 🔗](https://6klabs.com/)
 
-<a href="https://6klabs.com/">
+<a href="https://6klabs.com/" target="_blank">
   <Image src={SixKLabs} alt="6K Labs widget" loading="lazy" />
 </a>
 
@@ -105,7 +105,7 @@ Streaming audio from Spotify to streaming services such as Twitch is against Spo
 
 ### [Pixel Chat 🔗](https://pixelchat.tv/)
 
-<a href="https://pixelchat.tv/"><Image src={PixelChat} alt="Pixel Chat widget" loading="lazy" /></a>
+<a href="https://pixelchat.tv/" target="_blank"><Image src={PixelChat} alt="Pixel Chat widget" loading="lazy" /></a>
 
 - Shows what you're playing via Spotify, Apple Music etc.
 - Includes other widgets for shoutouts, captions and counters
diff --git a/src/pages/guide/stream-widgets.mdx b/src/pages/guide/stream-widgets.mdx
index 73811fb..a215707 100644
--- a/src/pages/guide/stream-widgets.mdx
+++ b/src/pages/guide/stream-widgets.mdx
@@ -29,7 +29,7 @@ A pomodoro timer is a great way to keep track of your work sessions. It’s also
 
 #### [MohFocus' Minimal Pomo Timer 🔗](https://github.com/mohamed-tayeh/Minimal-Pomo-Timer)
 
-<a href="https://github.com/mohamed-tayeh/Minimal-Pomo-Timer">
+<a href="https://github.com/mohamed-tayeh/Minimal-Pomo-Timer" target="_blank">
     <Image src={MohMinimalTimer} alt="Minimal Pomo Timer" loading="eager"/>
 </a>
 
@@ -40,7 +40,7 @@ A pomodoro timer is a great way to keep track of your work sessions. It’s also
 
 #### [Mayuko's Pomodoro Countdown Timer 🔗](https://github.com/hellomayuko/Pomodoro-Countdown)
 
-<a href="https://github.com/hellomayuko/Pomodoro-Countdown">
+<a href="https://github.com/hellomayuko/Pomodoro-Countdown" target="_blank">
   <Image src={MayukoPomo} alt="Mayuko Pomodoro Countdown Timer" loading="lazy" />
 </a>
 
@@ -51,7 +51,7 @@ A pomodoro timer is a great way to keep track of your work sessions. It’s also
 
 #### [Pomofocus 🔗](https://pomofocus.io/)
 
-<a href="https://pomofocus.io/"><Image src={Pomofocus} alt="pomofocus" loading="lazy" /></a>
+<a href="https://pomofocus.io/" target="_blank"><Image src={Pomofocus} alt="pomofocus" loading="lazy" /></a>
 
 - You can also add tasks to do on the web page
 
@@ -63,7 +63,7 @@ A task list widget is a great way to keep track of your tasks along with your ch
 
 ### [Rython Task Bot 🔗](https://github.com/liyunze-coding/chat-task-tic-overlay-infinity)
 
-<a href="https://github.com/liyunze-coding/chat-task-tic-overlay-infinity">
+<a href="https://github.com/liyunze-coding/chat-task-tic-overlay-infinity" target="_blank">
 <Image src={RythonTaskBot} alt="Rython Task Bot" loading="lazy" />
 </a>
 
@@ -75,7 +75,7 @@ A task list widget is a great way to keep track of your tasks along with your ch
 
 ### [Multi-task Widget 🔗](https://ko-fi.com/s/94e7e8dc81)
 
-<a href="https://ko-fi.com/s/94e7e8dc81">
+<a href="https://ko-fi.com/s/94e7e8dc81" target="_blank">
 <Image src={MultiTask} alt="Multi Task Widget" loading="lazy" />
 </a>
 
@@ -88,7 +88,7 @@ A task list widget is a great way to keep track of your tasks along with your ch
 
 ### [Super Sweet Bot 🔗](https://www.patreon.com/super_sweet_bot)
 
-<a href="https://www.patreon.com/super_sweet_bot">
+<a href="https://www.patreon.com/super_sweet_bot" target="_blank">
 <Image src={SuperSweetBot} alt="Super Sweet Bot" loading="lazy" />
 </a>
 
@@ -105,7 +105,7 @@ Display what you're playing on Spotify or YouTube Music!
 
 ### [6K Labs 🔗](https://6klabs.com/)
 
-<a href="https://6klabs.com/">
+<a href="https://6klabs.com/" target="_blank">
 <Image src={SixKLabs} alt="6K Labs widget" loading="lazy" />
 </a>
 
@@ -122,7 +122,7 @@ Display what you're playing on Spotify or YouTube Music!
 
 ### [Pixel Chat 🔗](https://pixelchat.tv/)
 
-<a href="https://pixelchat.tv/">
+<a href="https://pixelchat.tv/" target="_blank">
 <Image src={PixelChat} alt="Pixel Chat widget" loading="lazy" />
 </a>
 
diff --git a/src/pages/tutorials/OBS.mdx b/src/pages/tutorials/OBS.mdx
index 6471b5d..df1108c 100644
--- a/src/pages/tutorials/OBS.mdx
+++ b/src/pages/tutorials/OBS.mdx
@@ -26,7 +26,7 @@ Check out this video from Hammer Dance on how to setup OBS! Note that this is ta
 
 If you want a simple, step-by-step guide on how to get started with study streaming on YouTube, check out [this article from Girl Knows Tech](https://girlknowstech.com/study-with-me-obs/)! 
 
-<a href="https://girlknowstech.com/study-with-me-obs/"> 
+<a href="https://girlknowstech.com/study-with-me-obs/" target="_blank"> 
 <Image src={StudyWithMeYT} alt="Study with me YouTube"  width="500"/>
 </a>