diff --git a/app/layout.tsx b/app/layout.tsx
index 42bece6b..1f27a70c 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -22,7 +22,7 @@ export default function RootLayoutWithProviders({
   return (
     <>
       <html lang="en" suppressHydrationWarning>
-        <body>
+        <body style={{ overflowX: "hidden" }}>
           <Providers>
             <Navbar />
             <main
@@ -31,6 +31,7 @@ export default function RootLayoutWithProviders({
                 transition-colors duration-700 ease-in-out
                 min-h-[calc(100vh-4rem)]
                 pt-${NAVBAR_HEIGHT}
+                overflow-x-hidden
               `}
             >
               <div
@@ -38,6 +39,7 @@ export default function RootLayoutWithProviders({
                   mx-auto max-w-3xl md:max-w-6xl
                   min-h-[85vh]
                   pt-10 p-4
+                  overflow-x-hidden
                 "
               >
                 {children}
diff --git a/app/skills/[skillKey]/page.tsx b/app/skills/[skillKey]/page.tsx
index 7026fa43..01a60503 100644
--- a/app/skills/[skillKey]/page.tsx
+++ b/app/skills/[skillKey]/page.tsx
@@ -57,9 +57,9 @@ export async function generateMetadata(
  * @returns A list of all the keys for the static pages that need to be generated.
  * @see https://nextjs.org/docs/pages/building-your-application/data-fetching/incremental-static-regeneration
  */
-// export const generateStaticParams = async () => {
-//   return skillDatabaseKeys.map((skillKey) => ({ skillKey }));
-// };
+export const generateStaticParams = async () => {
+  return skillDatabaseKeys.map((skillKey) => ({ skillKey }));
+};
 
 interface ProjectPageProps {
   params: { skillKey: string };
diff --git a/components/Modal/TechnologiesModal.tsx b/components/Modal/TechnologiesModal.tsx
index d9903829..2d23c730 100644
--- a/components/Modal/TechnologiesModal.tsx
+++ b/components/Modal/TechnologiesModal.tsx
@@ -164,16 +164,18 @@ const TechnologiesModal: React.FC = () => {
             </div>
 
             {/* List of Skills */}
-            {groupedSkills.map((categoryData, index) => (
-              <div key={index} className="mt-4 text-center md:text-left">
-                <HeadingThree title={categoryData.skillCategoryName} />
-                <div className="flex flex-wrap flex-row justify-center z-10 md:justify-start">
-                  {categoryData.skills.map((skillSlug) => (
-                    <SkillTag key={skillSlug} skillKey={skillSlug} />
-                  ))}
+            <div className="mt-4 text-center md:text-left space-y-14">
+              {groupedSkills.map((categoryData, index) => (
+                <div key={index}>
+                  <HeadingThree title={categoryData.skillCategoryName} />
+                  <div className="flex flex-wrap flex-row justify-center z-10 md:justify-start">
+                    {categoryData.skills.map((skillSlug) => (
+                      <SkillTag key={skillSlug} skillKey={skillSlug} />
+                    ))}
+                  </div>
                 </div>
-              </div>
-            ))}
+              ))}
+            </div>
 
             {/* separator */}
             <div className="w-full h-px bg-neutral-200 dark:bg-neutral-700 my-8" />
