diff --git a/components/core/I18nWidget/I18nWidget.module.css b/components/core/I18nWidget/I18nWidget.module.css
index 6c11be041..6e8883521 100644
--- a/components/core/I18nWidget/I18nWidget.module.css
+++ b/components/core/I18nWidget/I18nWidget.module.css
@@ -19,7 +19,7 @@
 }
 
 .item {
-  @apply flex cursor-pointer px-6 py-3 block transition ease-in-out duration-150 text-primary leading-6 font-medium text-gray-900 items-center;
+  @apply flex cursor-pointer px-6 py-3 flex transition ease-in-out duration-150 text-primary leading-6 font-medium items-center;
   text-transform: capitalize;
 }
 
diff --git a/components/core/UserNav/DropdownMenu.module.css b/components/core/UserNav/DropdownMenu.module.css
index 429ddebcf..755d34974 100644
--- a/components/core/UserNav/DropdownMenu.module.css
+++ b/components/core/UserNav/DropdownMenu.module.css
@@ -7,7 +7,7 @@
 }
 
 .link {
-  @apply flex cursor-pointer px-6 py-3 block transition ease-in-out duration-150 text-primary leading-6 font-medium text-gray-900 items-center;
+  @apply text-primary flex cursor-pointer px-6 py-3 flex transition ease-in-out duration-150 leading-6 font-medium items-center;
   text-transform: capitalize;
 }
 
diff --git a/pages/[...pages].tsx b/pages/[...pages].tsx
index be6cbe6f1..283eedd18 100644
--- a/pages/[...pages].tsx
+++ b/pages/[...pages].tsx
@@ -44,7 +44,7 @@ export default function Pages({
 }: InferGetStaticPropsType<typeof getStaticProps>) {
   return (
     <div className="max-w-2xl mx-auto py-20">
-      <HTMLContent html={page.body} />
+      {page?.body && <HTMLContent html={page.body} />}
     </div>
   )
 }