diff --git a/public/favicon/about.txt b/public/favicon/about.txt
new file mode 100644
index 0000000..7207339
--- /dev/null
+++ b/public/favicon/about.txt
@@ -0,0 +1,6 @@
+This favicon was generated using the following graphics from Twitter Twemoji:
+
+- Graphics Title: 1f37a.svg
+- Graphics Author: Copyright 2020 Twitter, Inc and other contributors (https://github.com/twitter/twemoji)
+- Graphics Source: https://github.com/twitter/twemoji/blob/master/assets/svg/1f37a.svg
+- Graphics License: CC-BY 4.0 (https://creativecommons.org/licenses/by/4.0/)
diff --git a/public/favicon/android-chrome-192x192.png b/public/favicon/android-chrome-192x192.png
new file mode 100644
index 0000000..e427b61
Binary files /dev/null and b/public/favicon/android-chrome-192x192.png differ
diff --git a/public/favicon/android-chrome-512x512.png b/public/favicon/android-chrome-512x512.png
new file mode 100644
index 0000000..61420f9
Binary files /dev/null and b/public/favicon/android-chrome-512x512.png differ
diff --git a/public/favicon/apple-touch-icon.png b/public/favicon/apple-touch-icon.png
new file mode 100644
index 0000000..d0707f0
Binary files /dev/null and b/public/favicon/apple-touch-icon.png differ
diff --git a/public/favicon/favicon-16x16.png b/public/favicon/favicon-16x16.png
new file mode 100644
index 0000000..06ea49e
Binary files /dev/null and b/public/favicon/favicon-16x16.png differ
diff --git a/public/favicon/favicon-32x32.png b/public/favicon/favicon-32x32.png
new file mode 100644
index 0000000..9b31c2d
Binary files /dev/null and b/public/favicon/favicon-32x32.png differ
diff --git a/public/favicon/favicon.ico b/public/favicon/favicon.ico
new file mode 100644
index 0000000..124c369
Binary files /dev/null and b/public/favicon/favicon.ico differ
diff --git a/public/favicon/site.webmanifest b/public/favicon/site.webmanifest
new file mode 100644
index 0000000..45dc8a2
--- /dev/null
+++ b/public/favicon/site.webmanifest
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
\ No newline at end of file
diff --git a/src/components/BeerById/BeerInfoHeader.tsx b/src/components/BeerById/BeerInfoHeader.tsx
index 990a108..3a9979d 100644
--- a/src/components/BeerById/BeerInfoHeader.tsx
+++ b/src/components/BeerById/BeerInfoHeader.tsx
@@ -40,10 +40,7 @@ const BeerInfoHeader: FC<{
           </header>
           {isPostOwner && (
             <div className="tooltip tooltip-left" data-tip={`Edit '${beerPost.name}'`}>
-              <Link
-                href={`/beers/${beerPost.id}/edit`}
-                className="btn-outline btn-sm btn"
-              >
+              <Link href={`/beers/${beerPost.id}/edit`} className="btn-ghost btn-xs btn">
                 <FaRegEdit className="text-xl" />
               </Link>
             </div>
diff --git a/src/components/BeerById/BeerPostCommentsSection.tsx b/src/components/BeerById/BeerPostCommentsSection.tsx
index 8340f67..3211315 100644
--- a/src/components/BeerById/BeerPostCommentsSection.tsx
+++ b/src/components/BeerById/BeerPostCommentsSection.tsx
@@ -52,7 +52,7 @@ const BeerPostCommentsSection: FC<BeerPostCommentsSectionProps> = ({ beerPost })
           {user ? (
             <BeerCommentForm beerPost={beerPost} mutate={mutate} />
           ) : (
-            <div className="flex h-full flex-col items-center justify-center">
+            <div className="flex h-52 flex-col items-center justify-center">
               <span className="text-lg font-bold">Log in to leave a comment.</span>
             </div>
           )}
@@ -73,7 +73,7 @@ const BeerPostCommentsSection: FC<BeerPostCommentsSectionProps> = ({ beerPost })
             {!!comments.length && (
               <div className="card bg-base-300 pb-6">
                 {comments.map((comment, index) => {
-                  const isLastComment = index === comments.length - 1;
+                  const isPenulitmateComment = index === comments.length - 2;
 
                   /**
                    * Attach a ref to the last comment in the list. When it comes into
@@ -81,7 +81,7 @@ const BeerPostCommentsSection: FC<BeerPostCommentsSectionProps> = ({ beerPost })
                    */
                   return (
                     <div
-                      ref={isLastComment ? lastCommentRef : undefined}
+                      ref={isPenulitmateComment ? lastCommentRef : undefined}
                       key={comment.id}
                     >
                       <CommentCardBody comment={comment} mutate={mutate} />
@@ -94,9 +94,7 @@ const BeerPostCommentsSection: FC<BeerPostCommentsSectionProps> = ({ beerPost })
                    * If there are more comments to load, show a loading component with a
                    * skeleton loader and a loading spinner.
                    */
-                  !!isLoadingMore && (
-                    <LoadingComponent length={Math.floor(PAGE_SIZE / 2)} />
-                  )
+                  !!isLoadingMore && <LoadingComponent length={PAGE_SIZE} />
                 }
 
                 {
diff --git a/src/components/BeerById/BeerRecommendations.tsx b/src/components/BeerById/BeerRecommendations.tsx
index 758404a..57b43a1 100644
--- a/src/components/BeerById/BeerRecommendations.tsx
+++ b/src/components/BeerById/BeerRecommendations.tsx
@@ -20,13 +20,13 @@ const BeerRecommendations: FunctionComponent<BeerRecommendationsProps> = ({
                 </h2>
               </Link>
               <Link href={`/breweries/${beerPost.brewery.id}`} className="link-hover">
-                <p className="truncate text-lg font-semibold lg:text-xl">
+                <p className="text-md truncate font-semibold lg:text-xl">
                   {beerPost.brewery.name}
                 </p>
               </Link>
             </div>
 
-            <div className="text-md space-x-3 lg:text-lg">
+            <div className="space-x-3 text-sm lg:text-lg">
               <span>{beerPost.abv}% ABV</span>
               <span>{beerPost.ibu} IBU</span>
             </div>
diff --git a/src/components/BeerById/CommentCardBody.tsx b/src/components/BeerById/CommentCardBody.tsx
index bd28efa..f8102f6 100644
--- a/src/components/BeerById/CommentCardBody.tsx
+++ b/src/components/BeerById/CommentCardBody.tsx
@@ -35,7 +35,7 @@ const CommentCardDropdown: FC<CommentCardProps> = ({ comment, mutate }) => {
   };
 
   return (
-    <div className="dropdown">
+    <div className="dropdown dropdown-end">
       <label tabIndex={0} className="btn-ghost btn-sm btn m-1">
         <FaEllipsisH />
       </label>
@@ -45,7 +45,12 @@ const CommentCardDropdown: FC<CommentCardProps> = ({ comment, mutate }) => {
       >
         <li>
           {isCommentOwner ? (
-            <button onClick={handleDelete}>Delete</button>
+            <>
+              <button type="button">Edit</button>
+              <button type="button" onClick={handleDelete}>
+                Delete
+              </button>
+            </>
           ) : (
             <button>Report</button>
           )}
diff --git a/src/components/BeerIndex/BeerCard.tsx b/src/components/BeerIndex/BeerCard.tsx
index aae767f..ef03600 100644
--- a/src/components/BeerIndex/BeerCard.tsx
+++ b/src/components/BeerIndex/BeerCard.tsx
@@ -27,12 +27,12 @@ const BeerCard: FC<{ post: z.infer<typeof beerPostQueryResult> }> = ({ post }) =
       <div className="card-body justify-between">
         <div className="space-y-1">
           <Link href={`/beers/${post.id}`}>
-            <h2 className="link-hover link overflow-hidden text-ellipsis whitespace-normal text-2xl font-bold lg:text-3xl">
+            <h2 className="link-hover link overflow-hidden whitespace-normal text-2xl font-bold lg:truncate lg:text-3xl">
               {post.name}
             </h2>
           </Link>
           <Link href={`/breweries/${post.brewery.id}`}>
-            <h3 className="text-md link-hover link overflow-hidden text-ellipsis lg:text-xl">
+            <h3 className="text-md link-hover link whitespace-normal lg:truncate lg:text-xl">
               {post.brewery.name}
             </h3>
           </Link>
diff --git a/src/components/RegisterUserForm.tsx b/src/components/RegisterUserForm.tsx
index ab092ae..f5cdd58 100644
--- a/src/components/RegisterUserForm.tsx
+++ b/src/components/RegisterUserForm.tsx
@@ -48,8 +48,8 @@ const RegisterUserForm: FC = () => {
         )}
       </div>
       <div>
-        <div className="flex flex-row space-x-3">
-          <div className="w-[50%]">
+        <div className="flex flex-col lg:flex-row lg:space-x-3">
+          <div className="lg:w-[50%]">
             <FormInfo>
               <FormLabel htmlFor="firstName">First name</FormLabel>
               <FormError>{errors.firstName?.message}</FormError>
@@ -66,7 +66,7 @@ const RegisterUserForm: FC = () => {
             </FormSegment>
           </div>
 
-          <div className="w-[50%]">
+          <div className="lg:w-[50%]">
             <FormInfo>
               <FormLabel htmlFor="lastName">Last name</FormLabel>
               <FormError>{errors.lastName?.message}</FormError>
@@ -84,8 +84,8 @@ const RegisterUserForm: FC = () => {
           </div>
         </div>
 
-        <div className="flex flex-row space-x-3">
-          <div className="w-[50%]">
+        <div className="flex flex-col lg:flex-row lg:space-x-3">
+          <div className="lg:w-[50%]">
             <FormInfo>
               <FormLabel htmlFor="email">email</FormLabel>
               <FormError>{errors.email?.message}</FormError>
@@ -101,7 +101,7 @@ const RegisterUserForm: FC = () => {
               />
             </FormSegment>
           </div>
-          <div className="w-[50%]">
+          <div className="lg:w-[50%]">
             <FormInfo>
               <FormLabel htmlFor="username">username</FormLabel>
               <FormError>{errors.username?.message}</FormError>
@@ -119,8 +119,8 @@ const RegisterUserForm: FC = () => {
           </div>
         </div>
 
-        <div className="flex flex-row space-x-3">
-          <div className="w-[50%]">
+        <div className="flex flex-col lg:flex-row lg:space-x-3">
+          <div className="lg:w-[50%]">
             <FormInfo>
               <FormLabel htmlFor="password">password</FormLabel>
               <FormError>{errors.password?.message}</FormError>
@@ -136,7 +136,7 @@ const RegisterUserForm: FC = () => {
               />
             </FormSegment>
           </div>
-          <div className="w-[50%]">
+          <div className="lg:w-[50%]">
             <FormInfo>
               <FormLabel htmlFor="confirmPassword">confirm password</FormLabel>
               <FormError>{errors.confirmPassword?.message}</FormError>
diff --git a/src/components/ui/Layout.tsx b/src/components/ui/Layout.tsx
index 3ff6558..8358a7e 100644
--- a/src/components/ui/Layout.tsx
+++ b/src/components/ui/Layout.tsx
@@ -5,7 +5,7 @@ const Layout: FC<{ children: ReactNode }> = ({ children }) => {
   return (
     <div className="flex h-screen flex-col">
       <Navbar />
-      <div className="top-0 h-full flex-1 overflow-x-auto animate-in fade-in">
+      <div className="top-0 h-full w-screen flex-1 overflow-x-auto animate-in fade-in">
         {children}
       </div>
     </div>
diff --git a/src/components/ui/forms/FormPageLayout.tsx b/src/components/ui/forms/FormPageLayout.tsx
index 4fef0c1..0156baf 100644
--- a/src/components/ui/forms/FormPageLayout.tsx
+++ b/src/components/ui/forms/FormPageLayout.tsx
@@ -19,9 +19,9 @@ const FormPageLayout: FC<FormPageLayoutProps> = ({
   backLinkText,
 }) => {
   return (
-    <div className="align-center my-20 flex h-fit flex-col items-center justify-center">
-      <div className="w-8/12">
-        <div className="tooltip tooltip-bottom absolute" data-tip={backLinkText}>
+    <div className="align-center my-20 flex flex-col items-center justify-center">
+      <div className="w-10/12 lg:w-8/12 2xl:w-6/12">
+        <div className="tooltip tooltip-right" data-tip={backLinkText}>
           <Link href={backLink} className="btn-ghost btn-sm btn p-0">
             <BiArrowBack className="text-xl" />
           </Link>
@@ -30,7 +30,7 @@ const FormPageLayout: FC<FormPageLayoutProps> = ({
           {headingIcon({ className: 'text-4xl' })}{' '}
           <h1 className="text-3xl font-bold">{headingText}</h1>
         </div>
-        <div>{FormComponent}</div>
+        <div className="mt-3">{FormComponent}</div>
       </div>
     </div>
   );
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index aa90eb6..4eb64ed 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -21,6 +21,7 @@ export default function App({ Component, pageProps }: AppProps) {
           }
         `}
       </style>
+
       <UserContext.Provider value={{ user, isLoading, error, mutate }}>
         <Component {...pageProps} />
       </UserContext.Provider>
diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
index e1e9cbb..f5bcab6 100644
--- a/src/pages/_document.tsx
+++ b/src/pages/_document.tsx
@@ -3,7 +3,26 @@ import { Html, Head, Main, NextScript } from 'next/document';
 export default function Document() {
   return (
     <Html lang="en">
-      <Head />
+      <Head>
+        <link
+          rel="apple-touch-icon"
+          sizes="180x180"
+          href="favicon/apple-touch-icon.png"
+        />
+        <link
+          rel="icon"
+          type="image/png"
+          sizes="32x32"
+          href="favicon/favicon-32x32.png"
+        />
+        <link
+          rel="icon"
+          type="image/png"
+          sizes="16x16"
+          href="favicon/favicon-16x16.png"
+        />
+        <link rel="manifest" href="favicon/site.webmanifest" />
+      </Head>
       <body>
         <Main />
         <NextScript />
diff --git a/src/pages/beers/[id]/index.tsx b/src/pages/beers/[id]/index.tsx
index 6fca763..33f0462 100644
--- a/src/pages/beers/[id]/index.tsx
+++ b/src/pages/beers/[id]/index.tsx
@@ -47,17 +47,21 @@ const BeerByIdPage: NextPage<BeerPageProps> = ({ beerPost, beerRecommendations }
             infiniteLoop
             showThumbs={false}
           >
-            {beerPost.beerImages.map((image, index) => (
-              <div key={image.id} id={`image-${index}}`} className="w-full">
-                <Image
-                  alt={image.alt}
-                  src={image.path}
-                  height={1080}
-                  width={1920}
-                  className="h-[42rem] w-full object-cover"
-                />
-              </div>
-            ))}
+            {beerPost.beerImages.length
+              ? beerPost.beerImages.map((image, index) => (
+                  <div key={image.id} id={`image-${index}}`} className="w-full">
+                    <Image
+                      alt={image.alt}
+                      src={image.path}
+                      height={1080}
+                      width={1920}
+                      className="h-[42rem] w-full object-cover"
+                    />
+                  </div>
+                ))
+              : Array.from({ length: 1 }).map((_, i) => (
+                  <div className="h-[42rem] bg-base-300" key={i} />
+                ))}
           </Carousel>
 
           <div className="mb-12 mt-10 flex w-full items-center justify-center ">
diff --git a/src/pages/beers/index.tsx b/src/pages/beers/index.tsx
index f02693e..957fb04 100644
--- a/src/pages/beers/index.tsx
+++ b/src/pages/beers/index.tsx
@@ -11,7 +11,7 @@ import Spinner from '@/components/ui/Spinner';
 
 import useBeerPosts from '@/hooks/useBeerPosts';
 import BeerPostLoadingCard from '@/components/BeerIndex/BeerPostLoadingCard';
-import { FaArrowUp } from 'react-icons/fa';
+import { FaArrowUp, FaPlus } from 'react-icons/fa';
 
 const BeerPage: NextPage = () => {
   const { user } = useContext(UserContext);
@@ -39,14 +39,15 @@ const BeerPage: NextPage = () => {
       </Head>
       <div className="flex items-center justify-center bg-base-100" ref={pageRef}>
         <div className="my-10 flex w-11/12 flex-col space-y-4 lg:w-8/12 2xl:w-7/12">
-          <header className="my-10 flex flex-col justify-between lg:flex-row">
-            <div className="space-y-2">
-              <h1 className="text-6xl font-bold">The Biergarten Index</h1>
-            </div>
+          <header className="my-10 flex justify-between lg:flex-row">
+            <h1 className="text-6xl font-bold">The Biergarten Index</h1>
             {!!user && (
-              <div className="mt-6 lg:mt-0">
-                <Link href="/beers/create" className="btn-primary btn">
-                  Create a new beer post
+              <div
+                className="tooltip tooltip-left h-full"
+                data-tip="Create a new beer post"
+              >
+                <Link href="/beers/create" className="btn-ghost btn-sm btn">
+                  <FaPlus />
                 </Link>
               </div>
             )}
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 3d42234..cafe591 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -16,7 +16,7 @@ const Home: NextPage = () => {
               The Biergarten App
             </h1>
             <p className="mt-4 text-lg lg:text-2xl">
-              An app for beer lovers to share their favorite brews and breweries with
+              An app for beer lovers to share their favourite brews and breweries with
               like-minded people online.
             </p>
           </div>