diff --git a/public/robots.txt b/public/robots.txt
index 77470cb..e80fa28 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,2 +1,6 @@
 User-agent: *
-Disallow: /
\ No newline at end of file
+Disallow: /api/
+Disallow: /login/
+Disallow: /register/
+Disallow: /users/
+Disallow: /account/
diff --git a/src/components/BeerBreweryComments/CommentContentBody.tsx b/src/components/BeerBreweryComments/CommentContentBody.tsx
index 8665e0f..0864c39 100644
--- a/src/components/BeerBreweryComments/CommentContentBody.tsx
+++ b/src/components/BeerBreweryComments/CommentContentBody.tsx
@@ -22,12 +22,12 @@ const CommentContentBody: FC<CommentContentBodyProps> = ({ comment, setInEditMod
     <div className="card-body animate-in fade-in-10">
       <div className="flex flex-row justify-between">
         <div>
-          <h3 className="font-semibold sm:text-2xl">
+          <p className="font-semibold sm:text-2xl">
             <Link href={`/users/${comment.postedBy.id}`} className="link-hover link">
               {comment.postedBy.username}
             </Link>
-          </h3>
-          <h4 className="italic">
+          </p>
+          <span className="italic">
             posted{' '}
             <time
               className="tooltip tooltip-bottom"
@@ -36,7 +36,7 @@ const CommentContentBody: FC<CommentContentBodyProps> = ({ comment, setInEditMod
               {timeDistance}
             </time>{' '}
             ago
-          </h4>
+          </span>
         </div>
 
         {user && <CommentCardDropdown comment={comment} setInEditMode={setInEditMode} />}
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 1fcca27..b9e9602 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -1,15 +1,43 @@
 import { NextPage } from 'next';
 import Head from 'next/head';
 
+const keywords = [
+  'beer',
+  'bier',
+  'biergarten',
+  'brewery',
+  'brew',
+  'drink',
+  'alcohol',
+  'brews',
+  'breweries',
+  'craft beer',
+  'beer enthusiast',
+  'beer tasting',
+  'beer culture',
+  'beer connoisseur',
+  'beer reviews',
+  'beer community',
+  'beer events',
+  'brewpubs',
+  'beer aficionado',
+  'beer types',
+  'beer selection',
+  'beer recommendations',
+  'beer ratings',
+  'beer pairing',
+  'beer recipes',
+];
+
+const description = `The Biergarten App is an app for beer lovers to share their favourite brews and breweries with like-minded people online.`;
+
 const Home: NextPage = () => {
   return (
     <>
       <Head>
         <title>The Biergarten App</title>
-        <meta
-          name="description"
-          content="The Biergarten App is an app for beer lovers to share their favourite brews and breweries with like-minded people online."
-        />
+        <meta name="description" content={description} />
+        <meta name="keywords" content={keywords.join(', ')} />
       </Head>
 
       <div className="flex h-full w-full items-center justify-center bg-primary">
@@ -17,10 +45,7 @@ const Home: NextPage = () => {
           <h1 className="text-3xl font-bold md:text-4xl lg:text-5xl xl:text-8xl">
             The Biergarten App
           </h1>
-          <p className="mt-4 text-lg lg:text-2xl">
-            An app for beer lovers to share their favourite brews and breweries with
-            like-minded people online.
-          </p>
+          <p className="mt-4 text-lg lg:text-2xl">{description}</p>
         </div>
       </div>
     </>
