diff --git a/components/SideNavbar/SideNavbarCategoryList.tsx b/components/SideNavbar/SideNavbarCategoryList.tsx
index c97dbf137..07bf8413d 100644
--- a/components/SideNavbar/SideNavbarCategoryList.tsx
+++ b/components/SideNavbar/SideNavbarCategoryList.tsx
@@ -64,7 +64,7 @@ const getFilteredCategoryList = (query: string) => {
 
 const matchSearch = (item: SubCategories, query: string) => {
   const itemName = item.name.toLowerCase()
-  const matchingResources = item.resources.filter(
+  const matchingResources = item.resources?.filter(
     (resource: { name: string }) =>
       resource.name.toLowerCase().includes(query.toLowerCase())
   )
diff --git a/components/TopBar/CategoryDescriptions.ts b/components/TopBar/CategoryDescriptions.ts
index ea6cb2d77..fc249aaed 100644
--- a/components/TopBar/CategoryDescriptions.ts
+++ b/components/TopBar/CategoryDescriptions.ts
@@ -242,13 +242,12 @@ const categoryDescriptions: CategoryDescriptions = {
     '"Ethers" generally refers to both the native cryptocurrency of the Ethereum network and a popular JavaScript library used for interacting with the Ethereum blockchain.',
 
   //cloud computing
-  aws: "AWS, Amazon's cloud computing platform, provides scalable and reliable services, including computing power, storage, and machine learning. Trusted by millions, AWS enables businesses to innovate and transform digitally with efficiency.",
-  gcp: 'Google Cloud is a prominent cloud computing platform offering a range of services, from computing and storage to advanced AI solutions. Trusted by businesses, it facilitates innovation and scalability.',
-  azure:
-    'Microsoft Cloud, known as Azure, is a comprehensive cloud computing platform. With diverse services, including computing, storage, and AI, Azure empowers businesses to thrive in the digital landscape.',
-  oracle:
-    'Oracle Cloud is a leading cloud computing platform providing a robust suite of services. From databases to advanced solutions, Oracle Cloud supports businesses in achieving scalability, security, and innovation.',
-  ibm: 'IBM Cloud stands as a formidable cloud computing platform, offering a wide array of services. From computing power to advanced technologies, IBM Cloud supports businesses in their digital transformation journey.',
+  'aws-cloud': 'AWS, Amazon\'s cloud computing platform, provides scalable and reliable services, including computing power, storage, and machine learning. Trusted by millions, AWS enables businesses to innovate and transform digitally with efficiency.',
+  'google-cloud': 'Google Cloud is a prominent cloud computing platform offering a range of services, from computing and storage to advanced AI solutions. Trusted by businesses, it facilitates innovation and scalability.',
+  'microsoft-cloud': 'Microsoft Cloud, known as Azure, is a comprehensive cloud computing platform. With diverse services, including computing, storage, and AI, Azure empowers businesses to thrive in the digital landscape.',
+  'oracle-cloud': 'Oracle Cloud is a leading cloud computing platform providing a robust suite of services. From databases to advanced solutions, Oracle Cloud supports businesses in achieving scalability, security, and innovation.',
+  'ibm-cloud': 'IBM Cloud stands as a formidable cloud computing platform, offering a wide array of services. From computing power to advanced technologies, IBM Cloud supports businesses in their digital transformation journey.',
+
 
   //internet of things
   coursera:
diff --git a/components/TopBar/TopBar.tsx b/components/TopBar/TopBar.tsx
index 416185f3d..80c9553ee 100644
--- a/components/TopBar/TopBar.tsx
+++ b/components/TopBar/TopBar.tsx
@@ -18,8 +18,10 @@ export const TopBar: FC<TopBarProps> = ({}) => {
   const { theme } = useTheme()
 
   const category = router.asPath
+  const categoryKeyName = category?.split('/')[1];
   const categoryName = category?.split('/')[1]?.split('-').join(' ')
-  const subcategoryName = category?.split('/')[2]?.split('-').join(' ')
+  const subCategoryKeyName = category?.split('/')[2]
+  const subcategoryName = subCategoryKeyName?.split('-').join(' ')
 
   const searchQuery = router.query.query?.toString() || ''
 
@@ -36,10 +38,9 @@ export const TopBar: FC<TopBarProps> = ({}) => {
       .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
       .join(' ')
   }
-
-  const description = categoryDescriptions[searchQuery || subcategoryName] || ''
+  const description =
+    categoryDescriptions[searchQuery || subCategoryKeyName] || ''
   const isResourceSelected = isValidResource(searchQuery || subcategoryName)
-
   if (router.pathname.length === 1) return null
   return isResourceSelected ? (
     <div
@@ -54,7 +55,7 @@ export const TopBar: FC<TopBarProps> = ({}) => {
       </Link>
       <RxSlash className="hidden md:inline-block" />
       <Link
-        href={'/' + categoryName}
+        href={'/' + categoryKeyName}
         className="bg-[#EDEDED] bg-opacity-20 px-[10px] py-[6px] rounded-md cursor-pointer hidden md:inline-block"
       >
         <h3>{capitalizeEachWord(categoryName)}</h3>
@@ -63,6 +64,7 @@ export const TopBar: FC<TopBarProps> = ({}) => {
       <Link href={'/' + categoryName} className="flex gap-x-2 items-center">
         <IoIosArrowBack className="md:hidden" />
       </Link>
+    
       <div className="md:bg-[#EDEDED] md:bg-opacity-20 px-[10px] py-[6px] text-xl md:text-base rounded-md truncate ...">
         <h3>{capitalizeEachWord(cleanedCategory)}</h3>
       </div>
diff --git a/database/BlockChain/smart-contracts.json b/database/BlockChain/smart-contracts.json
index 774ea8688..d4f2fe406 100644
--- a/database/BlockChain/smart-contracts.json
+++ b/database/BlockChain/smart-contracts.json
@@ -4,6 +4,6 @@
     "description": " Solidity is the programming language used for developing smart contracts on the Ethereum platform. The Solidity documentation provides comprehensive guidance on writing secure and efficient smart contracts.",
     "url": "https://docs.soliditylang.org/en/v0.8.21/",
     "category": "BlockChain",
-    "subcategory": "smartcontracts"
+    "subcategory": "smart-contracts"
   }
 ]
\ No newline at end of file
diff --git a/database/artificial_intelligence/NLP.json b/database/artificial_intelligence/natural-language-processing.json
similarity index 100%
rename from database/artificial_intelligence/NLP.json
rename to database/artificial_intelligence/natural-language-processing.json
diff --git a/database/cloud_computing_platforms/aws.json b/database/cloud_computing_platforms/aws-cloud.json
similarity index 91%
rename from database/cloud_computing_platforms/aws.json
rename to database/cloud_computing_platforms/aws-cloud.json
index a34d4de98..90f81e528 100644
--- a/database/cloud_computing_platforms/aws.json
+++ b/database/cloud_computing_platforms/aws-cloud.json
@@ -4,14 +4,14 @@
         "description": "Gain free, hands-on experience with the AWS platform, products, and services. AWS Activate provides eligible startups with a host of resources, including free AWS credits to spend on AWS services, and AWS Support. ",
         "url": "https://docs.aws.amazon.com/index.html",
         "category": "cloud-computing",
-        "subcategory": "aws"
+        "subcategory": "aws-cloud"
     },
     {
         "name": "AWS tutorial for beginners",
         "description": "Learn AWS from basic-to-advanced level. This playlist has short and great tutorials that will help you learn AWS.",
         "url": "https://www.youtube.com/playlist?list=PL6XT0grm_TfgtwtwUit305qS-HhDvb4du",
         "category": "cloud-computing",
-        "subcategory": "aws",
+        "subcategory": "aws-cloud",
         "language": "hindi"
     }
 ]
diff --git a/database/cloud_computing_platforms/gcp.json b/database/cloud_computing_platforms/google-cloud.json
similarity index 89%
rename from database/cloud_computing_platforms/gcp.json
rename to database/cloud_computing_platforms/google-cloud.json
index e41fce034..b9a3f3a4c 100644
--- a/database/cloud_computing_platforms/gcp.json
+++ b/database/cloud_computing_platforms/google-cloud.json
@@ -4,6 +4,6 @@
         "description": "Find guides, code samples, architectural diagrams, best practices, tutorials, API references, and more to learn how to build on Google Cloud.",
         "url": "https://cloud.google.com/docs/",
         "category": "cloud-computing",
-        "subcategory": "gcp"
+        "subcategory": "google-cloud"
     }
 ]
\ No newline at end of file
diff --git a/database/cloud_computing_platforms/ibm.json b/database/cloud_computing_platforms/ibm-cloud.json
similarity index 89%
rename from database/cloud_computing_platforms/ibm.json
rename to database/cloud_computing_platforms/ibm-cloud.json
index 106f5ef2c..3702bea45 100644
--- a/database/cloud_computing_platforms/ibm.json
+++ b/database/cloud_computing_platforms/ibm-cloud.json
@@ -4,6 +4,6 @@
         "description": "The IBM Cloud platform is composed of multiple components that work together to provide a consistent and dependable cloud experience.",
         "url": "https://cloud.ibm.com/docs",
         "category": "cloud-computing",
-        "subcategory": "ibm"
+        "subcategory": "ibm-cloud"
     }
 ]
\ No newline at end of file
diff --git a/database/cloud_computing_platforms/azure.json b/database/cloud_computing_platforms/microsoft-cloud.json
similarity index 89%
rename from database/cloud_computing_platforms/azure.json
rename to database/cloud_computing_platforms/microsoft-cloud.json
index 2a782c0ae..ff1286906 100644
--- a/database/cloud_computing_platforms/azure.json
+++ b/database/cloud_computing_platforms/microsoft-cloud.json
@@ -4,13 +4,13 @@
         "description": "Learn how to build and manage powerful applications using Microsoft Azure cloud services. Get documentation, example code, tutorials, and more.",
         "url": "https://learn.microsoft.com/en-us/azure/?product=popular",
         "category": "cloud-computing",
-        "subcategory": "azure"
+        "subcategory": "microsoft-cloud"
     },
     {
         "name": "Microsoft Learn & Certified",
         "description": "Microsoft has certification paths for many technical job roles. Each of these certifications consists of passing a series of exams to earn them. ",
         "url": "https://learn.microsoft.com/en-us/certifications/",
         "category": "cloud-computing",
-        "subcategory": "azure"
+        "subcategory": "microsoft-cloud"
     }
 ]
\ No newline at end of file
diff --git a/database/cloud_computing_platforms/oracle.json b/database/cloud_computing_platforms/oracle-cloud.json
similarity index 88%
rename from database/cloud_computing_platforms/oracle.json
rename to database/cloud_computing_platforms/oracle-cloud.json
index 21604b9c7..a1cb44eeb 100644
--- a/database/cloud_computing_platforms/oracle.json
+++ b/database/cloud_computing_platforms/oracle-cloud.json
@@ -4,13 +4,13 @@
         "description": "Looking for comprehensive documentation, tutorials, or videos so you can learn about Oracle Cloud Services? You can find all of these resources here in the Oracle Help Center.",
         "url": "https://docs.oracle.com/en/cloud/get-started/index.html",
         "category": "cloud-computing",
-        "subcategory": "oracle"
+        "subcategory": "oracle-cloud"
     },
     {
         "name": "OCI certifications",
         "description": "Accelerate your cloud journey along with free certification from Oracle",
         "url": "https://education.oracle.com/home",
         "category": "cloud-computing",
-        "subcategory": "oracle"
+        "subcategory": "oracle-cloud"
     }
 ]
diff --git a/database/cybersecurity/defensive_security.json b/database/cybersecurity/defensive-security.json
similarity index 100%
rename from database/cybersecurity/defensive_security.json
rename to database/cybersecurity/defensive-security.json
diff --git a/database/cybersecurity/malware_analysis.json b/database/cybersecurity/malware-analysis.json
similarity index 100%
rename from database/cybersecurity/malware_analysis.json
rename to database/cybersecurity/malware-analysis.json
diff --git a/database/cybersecurity/offensive_security.json b/database/cybersecurity/offensive-security.json
similarity index 100%
rename from database/cybersecurity/offensive_security.json
rename to database/cybersecurity/offensive-security.json
diff --git a/database/cybersecurity/web_application_security.json b/database/cybersecurity/web-application-security.json
similarity index 100%
rename from database/cybersecurity/web_application_security.json
rename to database/cybersecurity/web-application-security.json
diff --git a/database/data.ts b/database/data.ts
index 4a51d64da..5378fc826 100644
--- a/database/data.ts
+++ b/database/data.ts
@@ -139,7 +139,7 @@ export const sidebarData: ISidebar[] = [
       },
       {
         name: 'Tutorials',
-        url: '/tutorials',
+        url: '/os-tutorials',
         resources: DB.openSourceTutorials,
       },
     ],
@@ -199,7 +199,7 @@ export const sidebarData: ISidebar[] = [
       {
         name: 'NLP',
         url: '/natural-language-processing',
-        resources: DB.nlp,
+        resources: DB.naturalLanguageProcessing,
       },
     ],
   },
@@ -209,22 +209,22 @@ export const sidebarData: ISidebar[] = [
       {
         name: 'Offensive security',
         url: '/offensive-security',
-        resources: DB.offensive_security,
+        resources: DB.offensiveSecurity,
       },
       {
         name: 'Defensive Security',
         url: '/defensive-security',
-        resources: DB.defensive_security,
+        resources: DB.defensiveSecurity,
       },
       {
         name: 'Malware Analysis',
         url: '/malware-analysis',
-        resources: DB.malware_analysis,
+        resources: DB.malwareAnalysis,
       },
       {
         name: 'Web Security',
         url: '/web-security',
-        resources: DB.web_security,
+        resources: DB.webSecurity,
       },
     ],
   },
@@ -232,15 +232,15 @@ export const sidebarData: ISidebar[] = [
   {
     category: 'cloud-computing',
     subcategory: [
-      { name: 'google cloud', url: '/gcp', resources: DB.gcp },
+      { name: 'google cloud', url: '/google-cloud', resources: DB.googleCloud },
       {
         name: 'AWS cloud',
-        url: '/aws',
-        resources: DB.aws,
+        url: '/aws-cloud',
+        resources: DB.awsCloud,
       },
-      { name: 'Microsoft cloud', url: '/azure', resources: DB.azure },
-      { name: 'Oracle cloud', url: '/oracle', resources: DB.oracle },
-      { name: 'IBM cloud', url: '/ibm', resources: DB.ibm },
+      { name: 'Microsoft cloud', url: '/microsoft-cloud', resources: DB.microsoftCloud },
+      { name: 'Oracle cloud', url: '/oracle-cloud', resources: DB.oracleCloud },
+      { name: 'IBM cloud', url: '/ibm-cloud', resources: DB.ibmCloud },
     ],
   },
   {
@@ -307,6 +307,11 @@ export const sidebarData: ISidebar[] = [
         url: '/game-development',
         resources: DB.gameDevelopment,
       },
+      {
+        name: 'UI/UX Designing',
+        url: '/ui-ux-designing',
+        resources: DB.uiUxDesigning,
+      },
     ],
   },
   {
@@ -379,7 +384,7 @@ export const sidebarData: ISidebar[] = [
     subcategory: [
       {
         name: 'Smart Contracts',
-        url: '/smartcontracts',
+        url: '/smart-contracts',
         resources: DB.smartContracts,
       },
       {
diff --git a/database/index.ts b/database/index.ts
index 36b2a6c35..ebe6c0c93 100644
--- a/database/index.ts
+++ b/database/index.ts
@@ -57,28 +57,28 @@ export { default as swift } from './languages/swift.json'
 export { default as coursera } from './internet_of_things/coursera.json'
 export { default as raspberrypi } from './internet_of_things/raspberrypi.json'
 //cloud computing
-export { default as gcp } from './cloud_computing_platforms/gcp.json'
-export { default as aws } from './cloud_computing_platforms/aws.json'
-export { default as azure } from './cloud_computing_platforms/azure.json'
-export { default as oracle } from './cloud_computing_platforms/oracle.json'
-export { default as ibm } from './cloud_computing_platforms/ibm.json'
+export { default as googleCloud } from './cloud_computing_platforms/google-cloud.json'
+export { default as awsCloud } from './cloud_computing_platforms/aws-cloud.json'
+export { default as microsoftCloud } from './cloud_computing_platforms/microsoft-cloud.json'
+export { default as oracleCloud } from './cloud_computing_platforms/oracle-cloud.json'
+export { default as ibmCloud } from './cloud_computing_platforms/ibm-cloud.json'
 //cyber_security
-export { default as offensive_security } from './cybersecurity/offensive_security.json'
-export { default as defensive_security } from './cybersecurity/defensive_security.json'
-export { default as malware_analysis } from './cybersecurity/malware_analysis.json'
-export { default as web_security } from './cybersecurity/web_application_security.json'
+export { default as offensiveSecurity } from './cybersecurity/offensive-security.json'
+export { default as defensiveSecurity } from './cybersecurity/defensive-security.json'
+export { default as malwareAnalysis } from './cybersecurity/malware-analysis.json'
+export { default as webSecurity } from './cybersecurity/web-application-security.json'
 //artificial intelligence
 export { default as artificialIntelligence } from './artificial_intelligence/artificial-intelligence.json'
 export { default as ml } from './artificial_intelligence/machine-learning.json'
 export { default as dataScience } from './artificial_intelligence/data-science.json'
 export { default as deepLearning } from './artificial_intelligence/deep-learning.json'
-export { default as nlp } from './artificial_intelligence/NLP.json'
+export { default as naturalLanguageProcessing } from './artificial_intelligence/natural-language-processing.json'
 // Open-source
 export { default as openSourceArticles } from './open_source/articles.json'
 export { default as openSourcePrograms } from './open_source/os-programs.json'
 export { default as openSourceProjects } from './open_source/projects.json'
 export { default as openSourceTools } from './open_source/tools.json'
-export { default as openSourceTutorials } from './open_source/tutorials.json'
+export { default as openSourceTutorials } from './open_source/os-tutorials.json'
 // resources
 export { default as blogs } from './resources/blogs.json'
 export { default as officialdocs } from './resources/official-docs.json'
@@ -99,6 +99,8 @@ export { default as softwareTesting } from './youtube/software-testing.json'
 export { default as computerScience } from './youtube/computer-science.json'
 export { default as fintech } from './youtube/fintech.json'
 export { default as gameDevelopment } from './youtube/game-development.json'
+export { default as uiUxDesigning } from './youtube/ui-ux-designing.json'
+
 // other
 export { default as github } from './other/github.json'
 export { default as git } from './other/git.json'
@@ -114,7 +116,7 @@ export { default as cpPlatforms } from './competitive_programming/cp-platforms.j
 export { default as cpTutorials } from './competitive_programming/cp-tutorials.json'
 export { default as cpHelpers } from './competitive_programming/cp-helpers.json'
 // technical-writing
-export { default as technicalWritingTools } from './technical-writing/tools.json'
+export { default as technicalWritingTools } from './technical-writing/technical-writing-tools.json'
 // Placement-Preparation
 export { default as interviewPreparation } from './placement_prep/interview-preparation.json'
 export { default as jobPortals } from './placement_prep/job-portals.json'
diff --git a/database/open_source/tutorials.json b/database/open_source/os-tutorials.json
similarity index 97%
rename from database/open_source/tutorials.json
rename to database/open_source/os-tutorials.json
index fe778fc40..b725d4e01 100644
--- a/database/open_source/tutorials.json
+++ b/database/open_source/os-tutorials.json
@@ -4,7 +4,7 @@
     "description": "Even though the focus is on a specific project, this video provides great advice on how to maintain someone else's open source project.",
     "url": "https://youtu.be/WPaN9vIyqt4",
     "category": "open-source",
-    "subcategory": "tutorials"
+    "subcategory": "os-tutorials"
   },
   {
     "name": "Open Source BootCamp in Hindi",
diff --git a/database/technical-writing/tools.json b/database/technical-writing/technical-writing-tools.json
similarity index 100%
rename from database/technical-writing/tools.json
rename to database/technical-writing/technical-writing-tools.json
diff --git a/database/youtube/ui-ux.json b/database/youtube/ui-ux-designing.json
similarity index 91%
rename from database/youtube/ui-ux.json
rename to database/youtube/ui-ux-designing.json
index a3dec3f01..96842894c 100644
--- a/database/youtube/ui-ux.json
+++ b/database/youtube/ui-ux-designing.json
@@ -4,7 +4,7 @@
         "description": "The UI/UX Design Specialization brings a design-centric approach to user interface and user experience design, and offers practical, skill-based instruction centered around a visual communications perspective, rather than on one focused on marketing or programming alone",
         "url": "https://www.youtube.com/watch?v=pyQAiRuqUSM",
         "category": "youtube",
-        "subcategory": "ux-designing",
+        "subcategory": "ui-ux-designing",
         "language": "English"
     },
     {
@@ -12,7 +12,7 @@
         "description": "In this video, Ansh Mehra provides a step-by-step method to becoming a UX designer. If you want to become a UX designer and need a roadmap to achieve this goal, this video is a perfect fit for you!",
         "url": "https://www.youtube.com/watch?v=cwPU547bCDs",
         "category": "youtube",
-        "subcategory": "ux-designing",
+        "subcategory": "ui-ux-designing",
         "language": "Hindi"
     },
     {
@@ -20,7 +20,7 @@
         "description": "In this video, you will learn how a professional designer builds a full website design from scratch following the process of user experience and user interface. The tutorial also covers wireframing, prototyping, and designing in Figma.",
         "url": "https://www.youtube.com/watch?v=c9Wg6Cb_YlU&t=4094s",
         "category": "youtube",
-        "subcategory": "ux-designing",
+        "subcategory": "ui-ux-designing",
         "language": "English"
     }
 ]
diff --git a/pages/[category]/[...subcategory].tsx b/pages/[category]/[...subcategory].tsx
index 1b40199c2..33c1f18b2 100644
--- a/pages/[category]/[...subcategory].tsx
+++ b/pages/[category]/[...subcategory].tsx
@@ -22,7 +22,7 @@ const SubCategory: NextPage<PageProps> = ({ subcategory }) => {
   const title = `LinksHub - ${
     pageCategory[0].toUpperCase() + pageCategory.slice(1)
   }`
-  const numberOfCards = filterDB[0].length
+  const numberOfCards = filterDB[0]?.length
   const { totalPages, currentPage, startIndex, endIndex, handlePageChange } =
     usePagination(filterDB.length ? filterDB[0].length : 0)
   let content: JSX.Element[] | JSX.Element