diff --git a/components/ChatView/Header.tsx b/components/ChatView/Header.tsx
index f58aa12..1276cb8 100644
--- a/components/ChatView/Header.tsx
+++ b/components/ChatView/Header.tsx
@@ -1,41 +1,31 @@
-import { Menu } from "@headlessui/react";
-import { toast } from "react-hot-toast";
-import { useChatStore, useMessageStore } from "@/store";
+import { useEffect } from "react";
+import { useChatStore } from "@/store";
 import Icon from "../Icon";
 
 const Header = () => {
   const chatStore = useChatStore();
-  const messageStore = useMessageStore();
   const currentChat = chatStore.currentChat;
+  const title = currentChat?.title || "SQL Chat";
 
-  const handleClearMessage = () => {
-    messageStore.clearMessage((message) => message.chatId !== currentChat?.id);
-    toast.success("Message cleared");
-  };
+  useEffect(() => {
+    document.title = `${title} - SQL Chat`;
+  }, [title]);
 
   return (
-    <div className="sticky top-0 w-full flex flex-row justify-between items-center py-3 border-b bg-white shadow">
+    <div className="sticky top-0 w-full grid grid-cols-3 py-2 border-b bg-white">
       <div className="ml-4 relative flex justify-center">
         <Icon.Io.IoIosMenu className="text-gray-600 w-5 h-auto block sm:hidden" />
       </div>
-      <span className="w-auto">{currentChat?.title || "SQL Chat"}</span>
-      <div className="mr-4 relative flex justify-center">
-        <Menu>
-          <Menu.Button className="w-8 h-auto p-1 cursor-pointer outline-none rounded-md hover:shadow hover:bg-gray-100">
-            <Icon.Io.IoIosMore className="text-gray-600 w-full h-auto" />
-          </Menu.Button>
-          <Menu.Items className="absolute right-0 top-full mt-1 w-32 origin-top-right rounded-lg bg-white shadow-lg outline-none ring-1 ring-black ring-opacity-5 p-1 space-y-1">
-            <Menu.Item>
-              <div
-                className="w-full p-2 rounded-lg flex flex-row justify-start items-center cursor-pointer hover:bg-gray-100"
-                onClick={handleClearMessage}
-              >
-                <Icon.Io.IoMdTrash className="text-gray-600 w-5 h-auto mr-1" />
-                Clear
-              </div>
-            </Menu.Item>
-          </Menu.Items>
-        </Menu>
+      <span className="w-auto text-center">{title}</span>
+      <div className="sm:mr-4 relative flex flex-row justify-end items-center">
+        <a
+          href="https://www.bytebase.com?source=sqlchat"
+          className="flex flex-row justify-center items-center px-2 py-1 rounded-md hover:bg-gray-100 hover:shadow"
+          target="_blank"
+        >
+          <span className="text-sm text-gray-600 hidden sm:block">Crafted by</span>
+          <img className="h-5 w-auto ml-1" src="/bytebase-logo-full.png" alt="" />
+        </a>
       </div>
     </div>
   );
diff --git a/components/ConnectionSidebar.tsx b/components/ConnectionSidebar.tsx
index 1eda306..1f2bb6e 100644
--- a/components/ConnectionSidebar.tsx
+++ b/components/ConnectionSidebar.tsx
@@ -1,5 +1,4 @@
 import { head } from "lodash-es";
-import Link from "next/link";
 import { useEffect, useState } from "react";
 import { createPortal } from "react-dom";
 import { useChatStore, useConnectionStore } from "@/store";
@@ -65,19 +64,21 @@ const ConnectionSidebar = () => {
   return (
     <>
       <aside className="w-80 h-full flex flex-row justify-start items-start border-r">
-        <div className="w-16 h-full bg-gray-200 pl-2 py-4 flex flex-col justify-between items-center">
-          <div className="w-full flex flex-col justify-start items-start space-y-2">
+        <div className="w-16 h-full bg-gray-200 pl-2 py-4 pt-6 flex flex-col justify-between items-center">
+          <div className="w-full flex flex-col justify-start items-start">
             {connectionList.map((connection) => (
               <button
                 key={connection.id}
-                className={`w-full h-14 rounded-l-lg p-2 ${currentConnectionCtx?.connection.id === connection.id && "bg-gray-100 shadow"}`}
+                className={`w-full h-14 rounded-l-lg p-2 mt-2 ${
+                  currentConnectionCtx?.connection.id === connection.id && "bg-gray-100 shadow"
+                }`}
                 onClick={() => handleConnectionSelect(connection)}
               >
                 <EngineIcon engine={connection.engineType} className="w-auto h-full mx-auto" />
               </button>
             ))}
             <button
-              className="tooltip tooltip-right w-10 h-10 !mt-5 ml-2 p-2 bg-gray-100 rounded-full text-gray-500 cursor-pointer"
+              className="tooltip tooltip-right w-10 h-10 mt-4 ml-2 p-2 bg-gray-100 rounded-full text-gray-500 cursor-pointer"
               data-tip="Create Connection"
               onClick={() => toggleCreateConnectionModal(true)}
             >
@@ -95,9 +96,10 @@ const ConnectionSidebar = () => {
             </a>
           </div>
         </div>
-        <div className={`w-64 h-full overflow-y-auto bg-gray-100 px-4 ${databaseList.length === 0 && "pt-4"}`}>
+        <div className={`w-64 h-full overflow-y-auto bg-gray-100 px-4 pt-2 ${databaseList.length === 0 && "!pt-4"}`}>
           {databaseList.length > 0 && (
-            <div className="w-full sticky top-0 bg-gray-100 z-1 pt-5">
+            <div className="w-full sticky top-0 bg-gray-100 z-1">
+              <p className="text-sm leading-6 mb-1 text-gray-500">Select your database:</p>
               <select
                 className="w-full select select-bordered"
                 value={currentConnectionCtx?.database?.name}
@@ -114,7 +116,7 @@ const ConnectionSidebar = () => {
           {chatList.map((chat) => (
             <div
               key={chat.id}
-              className={`w-full max-w-full mt-2 py-3 px-4 rounded-lg flex flex-row justify-start items-center cursor-pointer border border-transparent hover:bg-gray-50 ${
+              className={`w-full max-w-full mt-2 first:mt-4 py-3 px-4 rounded-lg flex flex-row justify-start items-center cursor-pointer border border-transparent hover:bg-gray-50 ${
                 chat.id === chatStore.currentChat?.id && "!bg-white border-gray-200 font-medium"
               }`}
               onClick={() => chatStore.setCurrentChat(chat)}
diff --git a/public/bytebase-logo-full.png b/public/bytebase-logo-full.png
new file mode 100644
index 0000000..2fce2bd
Binary files /dev/null and b/public/bytebase-logo-full.png differ