diff --git a/components/layout/navbar/index.tsx b/components/layout/navbar/index.tsx
index 8d036b315..39361625d 100644
--- a/components/layout/navbar/index.tsx
+++ b/components/layout/navbar/index.tsx
@@ -13,23 +13,26 @@ export default async function Navbar() {
   const menu = await getMenu('next-js-frontend-header-menu');
 
   return (
-    <nav className="relative flex items-center justify-between bg-white p-4 dark:bg-black lg:px-6">
+    <nav className="relative flex items-center justify-between p-4 bg-white dark:bg-black lg:px-6">
       <div className="block w-1/3 md:hidden">
         <MobileMenu menu={menu} />
       </div>
-      <div className="flex justify-self-center md:w-1/3 md:justify-self-start">
-        <div className="md:mr-4">
-          <Link href="/" aria-label="Go back home">
-            <LogoIcon className="h-8 transition-transform hover:scale-110" />
+      <div className="flex w-2/5 justify-self-center md:justify-self-start">
+        <div className="flex-none mr-6 lg:mr-10">
+          <Link href="/" aria-label="Go back home" className="flex items-center">
+            <div className="relative flex items-center justify-center mr-2 text-black transition-colors border border-gray-200 rounded-md h-11 w-11 dark:border-gray-700 dark:text-white">
+              <LogoIcon className="h-8 transition-transform hover:scale-110" />
+            </div>
+            <div className="text-sm font-medium uppercase">Acme Store</div>
           </Link>
         </div>
         {menu.length ? (
-          <ul className="hidden md:flex md:items-center">
+          <ul className="hidden w-full mr-6 b md:flex md:items-center lg:mr-10">
             {menu.map((item: Menu) => (
               <li key={item.title}>
                 <Link
                   href={item.path}
-                  className="rounded-lg px-2 py-1 text-gray-800 hover:text-gray-500 dark:text-gray-200 dark:hover:text-gray-400"
+                  className="py-1 mr-3 text-gray-800 rounded-lg underline-offset-4 hover:text-gray-500 hover:underline dark:text-gray-500 dark:hover:text-gray-400 lg:mr-8"
                 >
                   {item.title}
                 </Link>
@@ -38,11 +41,11 @@ export default async function Navbar() {
           </ul>
         ) : null}
       </div>
-      <div className="hidden w-1/3 md:block">
+      <div className="flex-grow hidden md:block">
         <Search />
       </div>
 
-      <div className="flex w-1/3 justify-end">
+      <div className="flex justify-end w-2/5">
         <Suspense fallback={<CartIcon className="h-6" />}>
           <Cart />
         </Suspense>
diff --git a/components/layout/navbar/search.tsx b/components/layout/navbar/search.tsx
index fff895f43..7450b31f3 100644
--- a/components/layout/navbar/search.tsx
+++ b/components/layout/navbar/search.tsx
@@ -28,7 +28,7 @@ export default function Search() {
   return (
     <form
       onSubmit={onSubmit}
-      className="relative m-0 flex w-full items-center border border-gray-200 bg-transparent p-0 dark:border-gray-500"
+      className="relative flex items-center w-full p-0 m-0 bg-transparent border border-gray-700 rounded-full dark:border-gray-800"
     >
       <input
         type="text"
@@ -36,9 +36,9 @@ export default function Search() {
         placeholder="Search for products..."
         autoComplete="off"
         defaultValue={searchParams?.get('q') || ''}
-        className="w-full px-4 py-2 text-black dark:bg-black dark:text-gray-100"
+        className="w-full px-4 py-1 text-black bg-transparent dark:text-gray-100"
       />
-      <div className="absolute right-0 top-0 mr-3 flex h-full items-center">
+      <div className="absolute top-0 right-0 flex items-center h-full mr-3">
         <SearchIcon className="h-5" />
       </div>
     </form>