diff --git a/components/home/featured-roadmaps-list.tsx b/components/home/featured-roadmaps-list.tsx
new file mode 100644
index 000000000..6d7c69d24
--- /dev/null
+++ b/components/home/featured-roadmaps-list.tsx
@@ -0,0 +1,32 @@
+import { RoadmapType } from '../../lib/roadmap';
+import { Box, SimpleGrid, Tag } from '@chakra-ui/react';
+import { HomeRoadmapItem } from '../roadmap/home-roadmap-item';
+
+type FeaturedRoadmapsListProps = {
+  roadmaps: RoadmapType[];
+  title: string;
+
+};
+
+export function FeaturedRoadmapsList(props: FeaturedRoadmapsListProps) {
+  const { roadmaps, title } = props;
+
+  return (
+    <>
+      <Tag bg='gray.400' mb={4}>{title}</Tag>
+      <SimpleGrid columns={[1, 2, 3]} spacing={['10px', '10px', '15px']} mb='40px'>
+        {roadmaps.map((roadmap: RoadmapType, counter: number) => (
+          <HomeRoadmapItem
+            isUpcoming={roadmap.isUpcoming}
+            url={`/${roadmap.id}`}
+            key={roadmap.id}
+            colorIndex={counter}
+            title={roadmap.featuredTitle}
+            isCommunity={roadmap.isCommunity}
+            subtitle={roadmap.featuredDescription}
+          />
+        ))}
+      </SimpleGrid>
+    </>
+  );
+}
diff --git a/pages/index.tsx b/pages/index.tsx
index 8212ed0f1..8a7443a2a 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -12,6 +12,7 @@ import { getAllGuides, GuideType } from '../lib/guide';
 import { getAllVideos, VideoType } from '../lib/video';
 import Helmet from '../components/helmet';
 import { PageWrapper } from '../components/page-wrapper';
+import { FeaturedRoadmapsList } from '../components/home/featured-roadmaps-list';
 
 type HomeProps = {
   roadmaps: RoadmapType[];
@@ -46,36 +47,15 @@ export default function Home(props: HomeProps) {
             </Text>
           </Box>
 
-          <Tag bg='gray.400' mb={4}>Role Based Roadmaps</Tag>
-          <SimpleGrid columns={[1, 2, 3]} spacing={['10px', '10px', '15px']} mb='40px'>
-            {roadmaps.filter(roadmap => roadmap.type === 'role').map((roadmap: RoadmapType, counter: number) => (
-              <HomeRoadmapItem
-                isUpcoming={roadmap.isUpcoming}
-                url={`/${roadmap.id}`}
-                key={roadmap.id}
-                colorIndex={counter}
-                title={roadmap.featuredTitle}
-                isCommunity={roadmap.isCommunity}
-                subtitle={roadmap.featuredDescription}
-              />
-            ))}
-          </SimpleGrid>
+          <FeaturedRoadmapsList
+            roadmaps={roadmaps.filter(roadmap => roadmap.type === 'role')}
+            title={'Role Based Roadmaps' }
+          />
 
-          <Tag bg='gray.400' mb={4}>Tool Based Skill Trees</Tag>
-
-          <SimpleGrid columns={[1, 2, 3]} spacing={['10px', '10px', '15px']} mb='30px'>
-            {roadmaps.filter(roadmap => roadmap.type === 'tool').map((roadmap: RoadmapType, counter: number) => (
-              <HomeRoadmapItem
-                isUpcoming={roadmap.isUpcoming}
-                url={`/${roadmap.id}`}
-                key={roadmap.id}
-                colorIndex={counter}
-                title={roadmap.featuredTitle}
-                isCommunity={roadmap.isCommunity}
-                subtitle={roadmap.featuredDescription}
-              />
-            ))}
-          </SimpleGrid>
+          <FeaturedRoadmapsList
+            roadmaps={roadmaps.filter(roadmap => roadmap.type === 'tool')}
+            title={'Tool Based Skill Trees' }
+          />
         </Container>
       </Box>