diff --git a/src/lib/assets/icons/contact/IconEmail.svg b/src/lib/assets/icons/contact/IconEmail.svg
new file mode 100644
index 00000000..1c1a1f88
--- /dev/null
+++ b/src/lib/assets/icons/contact/IconEmail.svg
@@ -0,0 +1,12 @@
+<svg
+	xmlns="http://www.w3.org/2000/svg"
+	fill="none"
+	viewBox="0 0 24 24"
+	stroke-width="1.5"
+	stroke="white"
+	class="w-6 h-6">
+	<path
+		stroke-linecap="round"
+		stroke-linejoin="round"
+		d="M21.75 6.75v10.5a2.25 2.25 0 01-2.25 2.25h-15a2.25 2.25 0 01-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25m19.5 0v.243a2.25 2.25 0 01-1.07 1.916l-7.5 4.615a2.25 2.25 0 01-2.36 0L3.32 8.91a2.25 2.25 0 01-1.07-1.916V6.75" />
+</svg>
diff --git a/src/lib/assets/icons/contact/IconSocialDiscordInverse.svg b/src/lib/assets/icons/contact/IconSocialDiscordInverse.svg
new file mode 100644
index 00000000..fd9b9692
--- /dev/null
+++ b/src/lib/assets/icons/contact/IconSocialDiscordInverse.svg
@@ -0,0 +1,5 @@
+<svg width="35" height="28" viewBox="0 0 35 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M29.6281 2.83436C27.3641 1.78489 24.9432 1.02218 22.4123 0.587891C22.1014 1.14464 21.7383 1.89348 21.4879 2.48917C18.7975 2.08832 16.1318 2.08832 13.4908 2.48917C13.2405 1.89348 12.8691 1.14464 12.5555 0.587891C10.0218 1.02218 7.59821 1.78769 5.33414 2.83991C0.767497 9.67663 -0.470445 16.3435 0.148527 22.9158C3.17737 25.1566 6.11268 26.5179 8.99845 27.4087C9.71096 26.4372 10.3464 25.4044 10.8939 24.316C9.85125 23.9235 8.85265 23.4391 7.90909 22.8768C8.15941 22.6931 8.40427 22.501 8.64083 22.3034C14.3959 24.9702 20.6489 24.9702 26.3352 22.3034C26.5745 22.501 26.8193 22.6931 27.0669 22.8768C26.1206 23.4419 25.1193 23.9263 24.0766 24.3188C24.6241 25.4044 25.2568 26.44 25.9721 27.4114C28.8606 26.5207 31.7986 25.1594 34.8275 22.9158C35.5538 15.2969 33.5868 8.6912 29.6281 2.83436ZM11.6779 18.8739C9.95031 18.8739 8.53353 17.2761 8.53353 15.3303C8.53353 13.3845 9.92005 11.7839 11.6779 11.7839C13.4358 11.7839 14.8526 13.3817 14.8223 15.3303C14.825 17.2761 13.4358 18.8739 11.6779 18.8739ZM23.2981 18.8739C21.5705 18.8739 20.1537 17.2761 20.1537 15.3303C20.1537 13.3845 21.5402 11.7839 23.2981 11.7839C25.056 11.7839 26.4728 13.3817 26.4425 15.3303C26.4425 17.2761 25.056 18.8739 23.2981 18.8739Z"
+        fill="white" />
+</svg>
\ No newline at end of file
diff --git a/src/lib/components/Browse/CreateChannelDrawer.svelte b/src/lib/components/Browse/CreateChannelDrawer.svelte
index bf78f718..aa219e4d 100644
--- a/src/lib/components/Browse/CreateChannelDrawer.svelte
+++ b/src/lib/components/Browse/CreateChannelDrawer.svelte
@@ -62,7 +62,6 @@
 	const addChannel = async () => {
 		const channel = await post('/channel', newChannel)
 		await put(`/users/host-channels?hostChannelId=${channel._id}`)
-		//TODO: set currentChannel
 		goto(`/channel/${channel._id}`)
 	}
 </script>
@@ -92,7 +91,7 @@
 							Please hide all sensitive data before going live.
 						</p>
 
-						<div class="flex flex-row justify-center w-full">
+						<!-- <div class="flex flex-row justify-center w-full">
 							<div class="card w-40 shadow-xl">
 								<div class="card-body items-center max-h-40 {showThumbnail ? '!p-3' : ''}">
 									{#if showThumbnail}
@@ -108,8 +107,7 @@
 							bind:this={fileuploader}
 							on:change={fileupload}
 							type="file"
-							class="file-input file-input-bordered file-input-primary w-full mt-5" />
-
+							class="file-input file-input-bordered file-input-primary w-full mt-5" /> -->
 						<input
 							bind:value={newChannel.title}
 							type="text"
diff --git a/src/lib/components/Channel/Stream.svelte b/src/lib/components/Channel/ChannelStream.svelte
similarity index 100%
rename from src/lib/components/Channel/Stream.svelte
rename to src/lib/components/Channel/ChannelStream.svelte
diff --git a/src/lib/components/Chat/ChatDrawer.svelte b/src/lib/components/Chat/ChatDrawer.svelte
index 4c3d0561..3e88ff62 100644
--- a/src/lib/components/Chat/ChatDrawer.svelte
+++ b/src/lib/components/Chat/ChatDrawer.svelte
@@ -1,29 +1,10 @@
 <script lang="ts">
-	import { onMount } from 'svelte'
 	import ChatInput from '$lib/components/Chat/ChatInput.svelte'
 	import ChatMessage from '$lib/components/Chat/ChatMessage.svelte'
 
-	export let showDrawer: boolean
-	export let channel: any = undefined
-
-	let username = 'Gagan',
-		message =
-			'Hello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello WorldHello World',
-		role = 'Host'
-	let sender = { username, message, role }
-	let youSender = { username: 'Singh', message: 'hewrewrwe ehe', role: 'You' }
-	let modSender = { username: 'Simmi', message: 'hewe rew rwe rwhe', role: 'Mod' }
-	let otherSender = { username: 'Arjan', message: 'he wer wer wehe', role: 'Rando' }
-
-	onMount(async () => {
-		// if (!$tags.length) {
-		// 	await getTags()
-		// }
-	})
-
-	const sendMessage = async () => {
-		// await createChannel(newChannel)
-	}
+	export let showDrawer: boolean,
+		channel: any = undefined,
+		chatHistory: any = []
 </script>
 
 <div class="drawer drawer-end absolute w-full z-20 top-0 right-0">
@@ -35,51 +16,11 @@
 			<p class="p-3 text-xl mb-5 pb-2 border-purple-500 font-semibold border-b-2">
 				{channel.title || 'Chat'}
 			</p>
-
 			<div class="flex flex-col-reverse p-3 grow h-80 overflow-y-auto">
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={youSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={modSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={otherSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={youSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={modSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={otherSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={youSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={modSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={otherSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={youSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={modSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={otherSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={youSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={modSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={otherSender} />
-				<ChatMessage bind:sender={youSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={modSender} />
-				<ChatMessage bind:sender />
-				<ChatMessage bind:sender={otherSender} />
+				{#each chatHistory as sender}
+					<ChatMessage bind:sender />
+				{/each}
 			</div>
-
 			<div class="flex flex-row mt-auto p-3 w-full">
 				<ChatInput />
 			</div>
diff --git a/src/lib/components/Chat/ChatInput.svelte b/src/lib/components/Chat/ChatInput.svelte
index c5b30ed5..6faf97b2 100644
--- a/src/lib/components/Chat/ChatInput.svelte
+++ b/src/lib/components/Chat/ChatInput.svelte
@@ -1,14 +1,17 @@
 <script lang="ts">
-	import IconChatAttachment from '$lib/assets/icons/chat/IconChatAttachment.svelte'
-	import IconChatEmoji from '$lib/assets/icons/chat/IconChatEmoji.svelte'
-	import IconChatGif from '$lib/assets/icons/chat/IconChatGif.svelte'
-	import IconChatCode from '$lib/assets/icons/chat/IconChatCode.svelte'
+	// import IconChatAttachment from '$lib/assets/icons/chat/IconChatAttachment.svelte'
+	// import IconChatEmoji from '$lib/assets/icons/chat/IconChatEmoji.svelte'
+	// import IconChatGif from '$lib/assets/icons/chat/IconChatGif.svelte'
+	// import IconChatCode from '$lib/assets/icons/chat/IconChatCode.svelte'
 	import IconChatSendMessage from '$lib/assets/icons/chat/IconChatSendMessage.svelte'
+
+	const sendMessage = async () => {
+		// await createChannel(newChannel)
+	}
 </script>
 
 <form class="rounded-lg bg-base-100 p-2 w-96">
-	<label for="chat" class="sr-only">Your message</label>
-	<button
+	<!-- <button
 		type="button"
 		class="inline-flex justify-center p-2 text-gray-500 rounded-lg cursor-pointer hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:text-white dark:hover:bg-gray-600">
 		<IconChatAttachment />
@@ -31,13 +34,13 @@
 		class="p-2 text-gray-500 rounded-lg cursor-pointer hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:text-white dark:hover:bg-gray-600">
 		<IconChatCode />
 		<span class="sr-only">Add code snippet</span>
-	</button>
+	</button> -->
 	<div class="flex items-center py-2 rounded-lg">
 		<textarea
 			id="chat"
 			rows="1"
-			class="focus:h-32 block mx-2 p-2.5 w-full text-sm textarea textarea-bordered textarea-secondary"
-			placeholder="Your message..." />
+			class="block mx-2 p-2.5 w-full text-sm textarea textarea-bordered textarea-secondary"
+			placeholder="Your message..." /><!--focus:h-32 -->
 		<button
 			type="submit"
 			class="inline-flex justify-center p-2 text-secondary rounded-full cursor-pointer hover:text-gray-900 hover:bg-gray-100 dark:hover:text-white dark:hover:bg-gray-600">
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 935dabb0..01317280 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -76,7 +76,7 @@
 </script>
 
 <svelte:head>
-	<link rel="stylesheet" href="fonts/montserrat.css" />
+	<link rel="stylesheet" href="/fonts/montserrat.css" />
 	{@html `<script> 
           const theme = localStorage.getItem('theme') || 'dark';
           document.querySelector('html').dataset.theme = theme;
diff --git a/src/routes/channel/[channelId]/+page.svelte b/src/routes/channel/[channelId]/+page.svelte
index 2e22dc27..5fe1c34c 100644
--- a/src/routes/channel/[channelId]/+page.svelte
+++ b/src/routes/channel/[channelId]/+page.svelte
@@ -9,6 +9,7 @@
 
 	export let data: PageData
 
+	$: chatHistory = []
 	$: ({ post } = data)
 	let showDrawer = false
 	let channelSocket: WebSocket
@@ -38,7 +39,7 @@
 		})
 	})
 
-	onDestroy(() => channelSocket.close())
+	onDestroy(() => channelSocket?.close())
 </script>
 
 <div class="flex flex-col md:flex-row gap-4 py-5 pl-5">
@@ -53,6 +54,6 @@
 	</div>
 
 	{#if showDrawer}
-		<ChatDrawer bind:showDrawer bind:channel={post} />
+		<ChatDrawer bind:showDrawer bind:channel={post} bind:chatHistory />
 	{/if}
 </div>
diff --git a/src/routes/contact/+page.server.ts b/src/routes/contact/+page.server.ts
index a6d9e178..4bc599ce 100644
--- a/src/routes/contact/+page.server.ts
+++ b/src/routes/contact/+page.server.ts
@@ -2,11 +2,9 @@ import { error } from '@sveltejs/kit'
 import type { PageServerLoad } from './$types'
 
 export const load = (async ({ params }) => {
-    // const post = null
-
-    // if (post) {
-    //   return post
-    // }
-
-    // throw error(404, 'Not found')
-}) satisfies PageServerLoad
\ No newline at end of file
+	// const post = null
+	// if (post) {
+	//   return post
+	// }
+	// throw error(404, 'Not found')
+}) satisfies PageServerLoad
diff --git a/src/routes/contact/+page.svelte b/src/routes/contact/+page.svelte
index 9c3c9fbb..f6514606 100644
--- a/src/routes/contact/+page.svelte
+++ b/src/routes/contact/+page.svelte
@@ -1,107 +1,41 @@
-<div class="container mx-auto pt-16">
-	<div class="lg:flex">
-		<div
-			class="xl:w-2/5 lg:w-2/5 bg-primary py-16 xl:rounded-bl rounded-tl rounded-tr xl:rounded-tr-none">
-			<div class="xl:w-5/6 xl:px-0 px-8 mx-auto">
-				<h1 class="xl:text-4xl text-3xl pb-4 text-white font-bold">Get in touch</h1>
-				<p class="text-xl text-white pb-8 leading-relaxed font-normal lg:pr-4">
-					Got a question about us? Are you interested in partnering with us? Have some suggestions
-					or just want to say Hi? Just contact us. We are here to asset you.
-				</p>
-				<div class="flex items-center">
-					<div aria-label="email icon" role="img">
-						<svg
-							xmlns="http://www.w3.org/2000/svg"
-							fill="none"
-							viewBox="0 0 24 24"
-							stroke-width="1.5"
-							stroke="white"
-							class="w-6 h-6">
-							<path
-								stroke-linecap="round"
-								stroke-linejoin="round"
-								d="M21.75 6.75v10.5a2.25 2.25 0 01-2.25 2.25h-15a2.25 2.25 0 01-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25m19.5 0v.243a2.25 2.25 0 01-1.07 1.916l-7.5 4.615a2.25 2.25 0 01-2.36 0L3.32 8.91a2.25 2.25 0 01-1.07-1.916V6.75" />
-						</svg>
-					</div>
-					<p class="pl-4 text-white text-base">support@codecrow.io</p>
-				</div>
-				<p class="text-lg text-white pt-10 tracking-wide">
-					16192 Coastal Highway
-					<br />
-					Lewes, DE 19958 United States
-				</p>
-				<div class=" pt-16">
-					<a
-						href="/careers"
-						class="text-white font-bold tracking-wide underline focus:outline-none focus:ring-2 focus:ring-white ">
-						View Job Openings</a>
-				</div>
-			</div>
+<script lang="ts">
+	import IconEmail from '$lib/assets/icons/contact/IconEmail.svg'
+	import IconSocialDiscordInverse from '$lib/assets/icons/contact/IconSocialDiscordInverse.svg'
+</script>
+
+<div class="m-10 lg:w-2/5 bg-primary p-16 rounded-md">
+	<h1 class="text-4xl pb-4 text-white font-bold">Get in touch</h1>
+	<p class="text-xl text-white pb-8 leading-relaxed font-normal pr-4">
+		Got a question about us? Are you interested in partnering with us? Have some suggestions or just
+		want to say hi? Just contact us. We are here to asset you.
+	</p>
+	<div class="flex items-center">
+		<div aria-label="email icon" role="img">
+			<img class="w-7" src={IconEmail} alt="" />
 		</div>
-		<div class="xl:w-3/5 lg:w-3/5 h-full pt-5 pb-5 xl:pr-5 xl:pl-0 rounded-tr rounded-br">
-			<form id="contact" class="py-4 px-8 rounded-tr rounded-br">
-				<h1 class="text-4xl font-extrabold mb-6">Enter Details</h1>
-				<div class="block xl:flex w-full flex-wrap mb-6">
-					<div class="w-2/4 max-w-xs mb-6 xl:mb-0">
-						<div class="flex flex-col">
-							<label
-								for="full_name"
-								class="text-sm font-semibold leading-tight tracking-normal mb-2">Full Name</label>
-							<input
-								required
-								id="full_name"
-								name="full_name"
-								type="text"
-								class="input input-bordered input-primary w-64 h-10 flex"
-								placeholder="Elizabeth Caledonia"
-								aria-label="enter your full name input" />
-						</div>
-					</div>
-					<div class="w-2/4 max-w-xs xl:flex">
-						<div class="flex flex-col">
-							<label for="email" class=" text-sm font-semibold leading-tight tracking-normal mb-2"
-								>Email</label>
-							<input
-								required
-								id="email"
-								name="email"
-								type="email"
-								class="input input-bordered input-primary w-64 h-10 flex"
-								placeholder="example@email.com"
-								aria-label="enter your email input" />
-						</div>
-					</div>
-				</div>
-				<div class="flex w-full flex-wrap">
-					<div class="w-2/4 max-w-xs">
-						<div class="flex flex-col">
-							<label for="subject" class="text-sm font-semibold leading-tight tracking-normal mb-2"
-								>Subject</label>
-							<input
-								required
-								id="subject"
-								name="subject"
-								type="tel"
-								class="input input-bordered input-primary w-64 h-10 flex"
-								placeholder="Subject"
-								aria-label="enter a subject" />
-						</div>
-					</div>
-				</div>
-				<div class="w-full mt-6">
-					<div class="flex flex-col">
-						<label class="text-sm font-semibold mb-2" for="message">Message</label>
-						<textarea
-							placeholder=""
-							name="message"
-							class="textarea textarea-bordered textarea-primary flex mb-4 py-2 px-3"
-							rows="8"
-							id="message"
-							aria-label="enter your message input" />
-					</div>
-					<button type="submit" class="btn btn-primary">Submit</button>
-				</div>
-			</form>
+		<p class="pl-4 text-white text-base">
+			<a class="link" href="mailto: support@codecrow.io" target="_blank" rel="noreferrer"
+				>support@codecrow.io</a>
+		</p>
+	</div>
+	<div class="flex items-center mt-2">
+		<div aria-label="email icon" role="img">
+			<img class="w-7" src={IconSocialDiscordInverse} alt="" />
 		</div>
+		<p class="pl-4 text-white text-base">
+			<a class="link" href="https://discord.gg/CodeCrow" target="_blank" rel="noreferrer"
+				>Create a support ticket in our discord</a>
+		</p>
+	</div>
+	<p class="text-lg text-white pt-10 tracking-wide">
+		16192 Coastal Highway
+		<br />
+		Lewes, DE 19958 United States
+	</p>
+	<div class=" pt-16">
+		<a
+			href="/careers"
+			class="text-white font-bold tracking-wide underline focus:outline-none focus:ring-2 focus:ring-white ">
+			View Job Openings</a>
 	</div>
 </div>