diff --git a/apps/www/components/Features/index.tsx b/apps/www/components/Features/index.tsx
index 11603dd32d7..36ec624ce83 100644
--- a/apps/www/components/Features/index.tsx
+++ b/apps/www/components/Features/index.tsx
@@ -99,7 +99,7 @@ const Features = () => {
   const isSm = useBreakpoint(640)
 
   return (
-    <SectionContainer className="space-y-8 max-w-7xl pt-4 md:!pt-0">
+    <SectionContainer className="space-y-8 max-w-7xl pt-8 md:!pt-0">
       <dl className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:gap-6 lg:grid-cols-6">
         <Card
           url={Solutions['database'].url}
diff --git a/apps/www/components/Hero/Hero.tsx b/apps/www/components/Hero/Hero.tsx
index 5c863e2cf2c..87e7799f169 100644
--- a/apps/www/components/Hero/Hero.tsx
+++ b/apps/www/components/Hero/Hero.tsx
@@ -7,7 +7,7 @@ import HeroBackground from './HeroBackground'
 
 const Hero = () => (
   <div className="relative">
-    <SectionContainer className="md:py-16 lg:py-20">
+    <SectionContainer className="pt-12 md:py-16 lg:py-20">
       <div className="relative">
         <div className="mx-auto">
           <div className="mx-auto max-w-2xl lg:col-span-6 lg:flex lg:items-center justify-center text-center">
diff --git a/apps/www/components/Hero/HeroBackground.tsx b/apps/www/components/Hero/HeroBackground.tsx
index 8d697e08084..d2661f70362 100644
--- a/apps/www/components/Hero/HeroBackground.tsx
+++ b/apps/www/components/Hero/HeroBackground.tsx
@@ -1,28 +1,23 @@
 import React, { useEffect, useRef } from 'react'
 import styles from './hero.module.css'
 import { useWindowSize } from 'react-use'
-import { useTheme } from 'common'
-import { motion } from 'framer-motion'
 
 const HeroBackground = () => {
   const divRef = useRef(null)
-  const { isDarkMode } = useTheme()
   const { width } = useWindowSize()
 
   useEffect(() => {
-    const newHeight =
-      width < 768 ? 100000 / width : width > 1800 ? 30000 / width : (70000 / width) * 2
+    const divHeight =
+      width < 768 ? 50000 / width : width > 1800 ? 30000 / width : (70000 / width) * 2
 
     if (divRef?.current) {
-      ;(divRef.current as HTMLDivElement).style.height = `${Math.round(newHeight)}px`
-      console.log(width, newHeight)
+      ;(divRef.current as HTMLDivElement).style.height = `${Math.round(divHeight)}px`
     }
   }, [width])
 
   const svgTraceWidth = 1680
   const svgTraceHeight = 915
   const svgPath =
-    // 'M2.16005e-05 -0.000998163L1680 0.129286V234L834.197 1068.2L-0.000248139 234.001L2.16005e-05 -0.000998163Z'
     'M2.16005e-05 -0.000998163L1680 0.129286V234L834.197 1068.2L-0.000248139 234.001L2.16005e-05 -0.000998163Z'
 
   return (
@@ -59,44 +54,6 @@ const HeroBackground = () => {
               />
               <path d={svgPath} fill="var(--colors-scale1)" />
               <defs>
-                {/* 
-                // Animated trace
-                <motion.linearGradient
-                  animate={{
-                    x2: [
-                      -svgTraceWidth / 2,
-                      svgTraceWidth / 3,
-                      // (svgTraceWidth / 5) * 2,
-                      svgTraceWidth,
-                      svgTraceWidth,
-                    ],
-                    x1: [0, svgTraceWidth / 2, svgTraceWidth * 1.5, svgTraceWidth * 1.5],
-                    y1: [
-                      svgTraceHeight / 2,
-                      svgTraceHeight / 2,
-                      svgTraceHeight / 2,
-                      svgTraceHeight / 2,
-                    ],
-                    y2: [
-                      svgTraceHeight / 2,
-                      svgTraceHeight / 2,
-                      svgTraceHeight / 2,
-                      svgTraceHeight / 2,
-                    ],
-                  }}
-                  transition={{
-                    duration: 6,
-                    repeat: Infinity,
-                    ease: 'linear',
-                    delay: 4,
-                  }}
-                  id="electric-trace"
-                  gradientUnits="userSpaceOnUse"
-                >
-                  <stop stopColor="#3ecf8e" stopOpacity="0" />
-                  <stop stopColor="#3ecf8e" stopOpacity="0.8" />
-                  <stop offset="1" stopColor="#3E9BCF" stopOpacity="0" />
-                </motion.linearGradient> */}
                 <linearGradient
                   x1={svgTraceWidth / 2 - 100}
                   y1={svgTraceHeight / 2}
diff --git a/apps/www/components/Nav/index.tsx b/apps/www/components/Nav/index.tsx
index dfbadd56928..b52895fe1cb 100644
--- a/apps/www/components/Nav/index.tsx
+++ b/apps/www/components/Nav/index.tsx
@@ -2,7 +2,11 @@ import React, { useState } from 'react'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
 
+<<<<<<< HEAD
 import { Button, Badge, IconStar, IconChevronDown } from 'ui'
+=======
+import { Button, Badge, Announcement, IconStar, IconChevronDown } from 'ui'
+>>>>>>> c73d8f313 (chore: remove announcement banner)
 import FlyOut from '~/components/UI/FlyOut'
 import Transition from 'lib/Transition'
 
diff --git a/apps/www/public/images/index/edge-dark.jpg b/apps/www/public/images/index/edge-dark.jpg
index 6d5018c062c..fd97735f4b0 100644
Binary files a/apps/www/public/images/index/edge-dark.jpg and b/apps/www/public/images/index/edge-dark.jpg differ