diff --git a/src/components/common/ConnectButton.tsx b/src/components/common/ConnectButton.tsx
index a137bb73..95d1267d 100644
--- a/src/components/common/ConnectButton.tsx
+++ b/src/components/common/ConnectButton.tsx
@@ -106,10 +106,12 @@ export const ConnectButton: React.FC<{
                           >
                             {userSites.data?.[0]?.name || account.displayName}
                           </span>
-                          <span className="text-left leading-none text-xs text-gray-400">
-                            {"@" + userSites.data?.[0]?.username ||
-                              account.displayName}
-                          </span>
+                          {userSites.data?.[0]?.username && (
+                            <span className="text-left leading-none text-xs text-gray-400">
+                              {"@" + userSites.data?.[0]?.username ||
+                                account.displayName}
+                            </span>
+                          )}
                         </div>
                       </button>
                       <div
diff --git a/src/pages/dashboard/new-site.tsx b/src/pages/dashboard/new-site.tsx
index be147662..c7125ea6 100644
--- a/src/pages/dashboard/new-site.tsx
+++ b/src/pages/dashboard/new-site.tsx
@@ -56,7 +56,7 @@ export default function NewSitePage() {
       <SEOHead title="New Site" siteName={APP_NAME} />
       <div>
         <header className="px-5 text-sm  md:px-14 flex justify-between items-start py-10">
-          <Link href="/dashboard">
+          <button onClick={() => router.back()}>
             <a className="flex space-x-1 items-center">
               <svg
                 className="w-4 h-4"
@@ -70,16 +70,20 @@ export default function NewSitePage() {
                   clipRule="evenodd"
                 />
               </svg>
-              <span>Back to dashboard</span>
+              <span>Back</span>
             </a>
-          </Link>
+          </button>
           <div>
             <div className="text-zinc-400">Logged in as:</div>
             <div>{addressIn}</div>
           </div>
         </header>
         <div className="max-w-sm mx-auto mt-20">
-          <h2 className="text-3xl mb-10 text-center">Create a new site</h2>
+          <h2 className="text-3xl mb-8 text-center">Create a new site</h2>
+          <p className="mb-8 text-gray-500">
+            After creating your own site, you can start writing your blog and
+            interacting with other bloggers
+          </p>
           <form className="space-y-5" onSubmit={handleSubmit}>
             <div>
               <Input