diff --git a/app/components/H4.tsx b/app/components/H4.tsx
deleted file mode 100644
index bfbf79d630..0000000000
--- a/app/components/H4.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { twMerge } from "tailwind-merge"
-
-export const H4 = ({
-  className,
-  children,
-}:{
-  className?: string,
-  children: React.ReactNode,
-})=>{
-  return(
-    <h4
-      className={
-        twMerge("text-base font-medium text-white", className)
-      }
-    >
-      {children}
-    </h4>
-  )
-}
\ No newline at end of file
diff --git a/app/components/Typography.tsx b/app/components/Typography.tsx
new file mode 100644
index 0000000000..f2c0bda536
--- /dev/null
+++ b/app/components/Typography.tsx
@@ -0,0 +1,31 @@
+import { twMerge } from "tailwind-merge";
+
+interface TypogProps  {
+  className?: string;
+  children: React.ReactNode;
+}
+const baseTypo = "text-white";
+
+export const H1 = ({className,children,}:TypogProps)=>
+  <h1 className={twMerge(baseTypo, "font-medium text-2xl",className)}>{children}</h1>;
+
+export const H2 = ({className,children,}:TypogProps)=>
+  <h2 className={twMerge(baseTypo, "font-medium text-xl", className)}> {children} </h2>;
+
+export const H3 = ({className,children,}:TypogProps)=>
+  <h3 className={twMerge(baseTypo, "font-medium text-lg", className)}> {children} </h3>;
+
+export const H4 = ({className,children,}:TypogProps)=>
+  <h4 className={twMerge(baseTypo, "font-medium text-base", className)}> {children} </h4>;
+
+  export const Label = ({className,children,}:TypogProps)=>
+  <label className={twMerge(baseTypo, "font-medium text-base", className)}> {children} </label>;
+
+export const H5 = ({className,children,}:TypogProps)=>
+  <h5 className={twMerge(baseTypo, "font-medium text-sm",className)}> {children} </h5>;
+
+export const H6 = ({className,children,}:TypogProps)=>
+  <h6 className={twMerge(baseTypo, "font-light text-sm",className)}> {children} </h6>;
+
+export const P = ({className,children,}:TypogProps)=>
+  <p className={twMerge(baseTypo, className)}> {children} </p>;
\ No newline at end of file
diff --git a/app/components/index.tsx b/app/components/index.tsx
index 5dabccba07..323db7b12c 100644
--- a/app/components/index.tsx
+++ b/app/components/index.tsx
@@ -3,7 +3,7 @@ import { ButtonIcon } from "./ButtonIcon";
 import { ButtonLink } from "./ButtonLink";
 import { ButtonIconSelect } from "./ButtonIconSelect";
 import { Input } from "./Input";
-import { H4 } from "./H4";
+import { H1, H2, H3, H4, H5, H6, P, Label} from "./Typography";
 import { ItemPicker } from "./ItemPicker";
 import { Textarea } from "./Textarea";
 import { LoadingBar } from "./LoadingBar";
@@ -14,7 +14,7 @@ export {
   ButtonIcon,
   ButtonLink,
   ButtonIconSelect,
-  H4,
+  H1,H2,H3,H4,H5,H6,P,Label,
   ItemPicker,
   Textarea,
   Input,
diff --git a/app/routes/ComponentLibrary.tsx b/app/routes/ComponentLibrary.tsx
index fd340f82a6..c0e6719021 100644
--- a/app/routes/ComponentLibrary.tsx
+++ b/app/routes/ComponentLibrary.tsx
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { 
   Button,
   ButtonLink,
-  H4, 
+  H1,H2,H3,H4,H5,H6,P,Label,
   LoadingBar,
   LoadingDotsTyping,
   LoadingDotsBricks,
@@ -35,65 +35,84 @@ export default function ComponentLibrary () {
   },[progress]);
 
   return(
-    <div className='bg-ui-panel w-10/12 max-w-7xl h-full min-h-96 mx-auto my-6 rounded-lg p-6'>
+    <div
+      className="fixed w-full overflow-scroll"
+      style={{height: "calc(100% - 72px)"}}
+    >
+      <div
+        className='bg-ui-panel w-10/12 max-w-7xl mx-auto my-6 rounded-lg p-6'
+      >
 
-      <div className="flex flex-col gap-2 mb-4">
-        <H4>Buttons</H4>
-        <div className="flex gap-2">
-          <Button>Primary</Button>
-          <Button variant="secondary">Secondary</Button>
-          <Button className="bg-brand-tertiary hover:bg-brand-teriary-400 focus-visible:outline-brand-tertiary">
-            Prelim Tertiary
-          </Button>
-          <Button disabled>Disabled</Button>
-        </div>
-      </div>
-
-      <div className="flex flex-col gap-2 mb-4">
-        <H4>ButtonLink</H4>
-        <ButtonLink to="/">Back to /</ButtonLink>
-      </div>
-
-      <div className="flex flex-col gap-2 mb-4">
-        <H4>Loading Dots</H4>
-        <div className="flex gap-2">
-          <div className="w-60 h-40 rounded-lg overflow-hidden">
-            <LoadingDotsTyping />
-          </div>
-          <div className="w-60 h-40 rounded-lg overflow-hidden">
-            <LoadingDotsBricks />
+        <div className="flex flex-col gap-2 mb-4">
+          <H1>Typography</H1>
+          <H1>H1. This is an H1 Heading</H1>
+          <H2>H2. This is an H2 Heading</H2>
+          <H3>H3. This is an H3 Heading</H3>
+          <H4>H4. This is an H4 Heading</H4>
+          <Label>Label. Is essentially same as H4</Label>
+          <P>P. Is an normal Paragraph</P>
+          <H5>H5. This is an H5 Heading</H5>
+          <H6>H6. This is an H6 Heading</H6>
+    
+          <hr className="mt-2 mb-4"/>
+          <H1>Components</H1>
+          <H4>Buttons</H4>
+          <div className="flex gap-2">
+            <Button>Primary</Button>
+            <Button variant="secondary">Secondary</Button>
+            <Button className="bg-brand-tertiary hover:bg-brand-teriary-400 focus-visible:outline-brand-tertiary">
+              Prelim Tertiary
+            </Button>
+            <Button disabled>Disabled</Button>
           </div>
         </div>
-      </div>
 
-      <div className="flex flex-col gap-2 mb-4">
-        <H4>Loading Bar</H4>
-        <div className="flex gap-2 items-center">
+        <div className="flex flex-col gap-2 mb-4">
+          <H4>ButtonLink</H4>
+          <ButtonLink to="/">Back to /</ButtonLink>
+        </div>
+
+        <div className="flex flex-col gap-2 mb-4">
+          <H4>Loading Dots</H4>
+          <div className="flex gap-2">
+            <div className="w-60 h-40 rounded-lg overflow-hidden">
+              <LoadingDotsTyping />
+            </div>
+            <div className="w-60 h-40 rounded-lg overflow-hidden">
+              <LoadingDotsBricks />
+            </div>
+          </div>
+        </div>
+
+        <div className="flex flex-col gap-2 mb-4">
+          <H4>Loading Bar</H4>
+          <div className="flex gap-2 items-center">
+            <LoadingBar
+              progress={progress}
+              isShowing={progress !== 100}
+              wrapperClassName="rounded-lg"
+              message="this takes progress from parent"
+            />
+            <Button
+              className="h-fit"
+              onClick={()=>setProgress(0)}
+            >
+              Reset
+            </Button>
+          </div>
           <LoadingBar
-            progress={progress}
-            isShowing={progress !== 100}
-            wrapperClassName="rounded-lg"
-            message="this takes progress from parent"
+            label="labeling the bar"
+            message="displaying a message"
+          />
+          <LoadingBar
+            label="useFakeTimer = 30000 (30secs)"
+            useFakeTimer={30000}
+          />
+          <LoadingBar
+            label="useFakeTimer = 3000 (3secs)"
+            useFakeTimer={3000}
           />
-          <Button
-            className="h-fit"
-            onClick={()=>setProgress(0)}
-          >
-            Reset
-          </Button>
         </div>
-        <LoadingBar
-          label="labeling the bar"
-          message="displaying a message"
-        />
-        <LoadingBar
-          label="useFakeTimer = 30000 (30secs)"
-          useFakeTimer={30000}
-        />
-        <LoadingBar
-          label="useFakeTimer = 3000 (3secs)"
-          useFakeTimer={3000}
-        />
       </div>
     </div>
   );