diff --git a/.firebaserc b/.firebaserc
index 6edf38a..8c01f9f 100644
--- a/.firebaserc
+++ b/.firebaserc
@@ -11,4 +11,4 @@
   "projects": {
     "default": "edzeeta-certification"
   }
-}
\ No newline at end of file
+}
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
new file mode 100644
index 0000000..be6ddf9
--- /dev/null
+++ b/.github/workflows/firebase-hosting-merge.yml
@@ -0,0 +1,20 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on merge
+'on':
+  push:
+    branches:
+      - main
+jobs:
+  build_and_deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_EDZEETA_CERTIFICATION }}'
+          channelId: live
+          projectId: edzeeta-certification
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
new file mode 100644
index 0000000..bf10a17
--- /dev/null
+++ b/.github/workflows/firebase-hosting-pull-request.yml
@@ -0,0 +1,21 @@
+# This file was auto-generated by the Firebase CLI
+# https://github.com/firebase/firebase-tools
+
+name: Deploy to Firebase Hosting on PR
+'on': pull_request
+permissions:
+  checks: write
+  contents: read
+  pull-requests: write
+jobs:
+  build_and_preview:
+    if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: npm ci && npm run build
+      - uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_EDZEETA_CERTIFICATION }}'
+          projectId: edzeeta-certification
diff --git a/firebase.json b/firebase.json
index a47d207..566b60e 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,9 +1,16 @@
 {
-  "hosting": [
-    {
-      "target": "edzeeta-certificate",
-      "source": ".",
-      "frameworksBackend": {}
-    }
-  ]
-}
\ No newline at end of file
+  "hosting": {
+    "public": "y",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ],
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ]
+  }
+}
diff --git a/src/app/certificate/certificate.component.html b/src/app/certificate/certificate.component.html
index c16f565..e3e1a6e 100644
--- a/src/app/certificate/certificate.component.html
+++ b/src/app/certificate/certificate.component.html
@@ -4,13 +4,14 @@
 alt="edzeeta logo"
 />
 <div class="container">
+  <p class="heading">Validate your Certificate</p>
   <div class="custom-form">
     <input
       class="custom-input"
       type="text"
       placeholder="Enter your Credential ID"
       [(ngModel)]="credentialId"
-      maxlength="8"
+      maxlength="11"
       (ngModelChange)="successMessage = ''"
     />
     <div class="result-message">
diff --git a/src/app/certificate/certificate.component.scss b/src/app/certificate/certificate.component.scss
index 7f52e36..8604b33 100644
--- a/src/app/certificate/certificate.component.scss
+++ b/src/app/certificate/certificate.component.scss
@@ -1,6 +1,6 @@
 .custom-img{
-  width: 150px; 
-  height: 150px; 
+  width: 200px; 
+  height: 200px; 
   top: 0; 
   left: 0; 
   position: absolute;
@@ -21,6 +21,10 @@
   margin: 20px auto;
   font-family: "Montserrat", sans-serif;
 
+  .heading{
+    font-weight: bold;
+  }
+
   .custom-form {
     display: flex;
     justify-content: center;
diff --git a/src/app/verified-popup/verified-popup.component.html b/src/app/verified-popup/verified-popup.component.html
index 7731346..3bc0b72 100644
--- a/src/app/verified-popup/verified-popup.component.html
+++ b/src/app/verified-popup/verified-popup.component.html
@@ -8,10 +8,10 @@
         Course: <strong>{{ userData.courseName }}</strong>
       </p>
       <p>
-        Course Date: <strong>{{ userData.courseDate }}</strong>
+        Certificate Issued Date: <strong>{{ userData.courseDate }}</strong>
       </p>
       <p>
-        Type of session: <strong>{{ userData.courseType }}</strong>
+        Type of Certificate: <strong>{{ userData.courseType }}</strong>
       </p>
     </div>
     <div class="dialog-actions">
diff --git a/y/index.html b/y/index.html
new file mode 100644
index 0000000..a1578ec
--- /dev/null
+++ b/y/index.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Welcome to Firebase Hosting</title>
+
+    <!-- update the version number as needed -->
+    <script defer src="/__/firebase/10.10.0/firebase-app-compat.js"></script>
+    <!-- include only the Firebase features as you need -->
+    <script defer src="/__/firebase/10.10.0/firebase-auth-compat.js"></script>
+    <script defer src="/__/firebase/10.10.0/firebase-database-compat.js"></script>
+    <script defer src="/__/firebase/10.10.0/firebase-firestore-compat.js"></script>
+    <script defer src="/__/firebase/10.10.0/firebase-functions-compat.js"></script>
+    <script defer src="/__/firebase/10.10.0/firebase-messaging-compat.js"></script>
+    <script defer src="/__/firebase/10.10.0/firebase-storage-compat.js"></script>
+    <script defer src="/__/firebase/10.10.0/firebase-analytics-compat.js"></script>
+    <script defer src="/__/firebase/10.10.0/firebase-remote-config-compat.js"></script>
+    <script defer src="/__/firebase/10.10.0/firebase-performance-compat.js"></script>
+    <!-- 
+      initialize the SDK after all desired features are loaded, set useEmulator to false
+      to avoid connecting the SDK to running emulators.
+    -->
+    <script defer src="/__/firebase/init.js?useEmulator=true"></script>
+
+    <style media="screen">
+      body { background: #ECEFF1; color: rgba(0,0,0,0.87); font-family: Roboto, Helvetica, Arial, sans-serif; margin: 0; padding: 0; }
+      #message { background: white; max-width: 360px; margin: 100px auto 16px; padding: 32px 24px; border-radius: 3px; }
+      #message h2 { color: #ffa100; font-weight: bold; font-size: 16px; margin: 0 0 8px; }
+      #message h1 { font-size: 22px; font-weight: 300; color: rgba(0,0,0,0.6); margin: 0 0 16px;}
+      #message p { line-height: 140%; margin: 16px 0 24px; font-size: 14px; }
+      #message a { display: block; text-align: center; background: #039be5; text-transform: uppercase; text-decoration: none; color: white; padding: 16px; border-radius: 4px; }
+      #message, #message a { box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); }
+      #load { color: rgba(0,0,0,0.4); text-align: center; font-size: 13px; }
+      @media (max-width: 600px) {
+        body, #message { margin-top: 0; background: white; box-shadow: none; }
+        body { border-top: 16px solid #ffa100; }
+      }
+    </style>
+  </head>
+  <body>
+    <div id="message">
+      <h2>Welcome</h2>
+      <h1>Firebase Hosting Setup Complete</h1>
+      <p>You're seeing this because you've successfully setup Firebase Hosting. Now it's time to go build something extraordinary!</p>
+      <a target="_blank" href="https://firebase.google.com/docs/hosting/">Open Hosting Documentation</a>
+    </div>
+    <p id="load">Firebase SDK Loading&hellip;</p>
+
+    <script>
+      document.addEventListener('DOMContentLoaded', function() {
+        const loadEl = document.querySelector('#load');
+        // // 🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥
+        // // The Firebase SDK is initialized and available here!
+        //
+        // firebase.auth().onAuthStateChanged(user => { });
+        // firebase.database().ref('/path/to/ref').on('value', snapshot => { });
+        // firebase.firestore().doc('/foo/bar').get().then(() => { });
+        // firebase.functions().httpsCallable('yourFunction')().then(() => { });
+        // firebase.messaging().requestPermission().then(() => { });
+        // firebase.storage().ref('/path/to/ref').getDownloadURL().then(() => { });
+        // firebase.analytics(); // call to activate
+        // firebase.analytics().logEvent('tutorial_completed');
+        // firebase.performance(); // call to activate
+        //
+        // // 🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥🔥
+
+        try {
+          let app = firebase.app();
+          let features = [
+            'auth', 
+            'database', 
+            'firestore',
+            'functions',
+            'messaging', 
+            'storage', 
+            'analytics', 
+            'remoteConfig',
+            'performance',
+          ].filter(feature => typeof app[feature] === 'function');
+          loadEl.textContent = `Firebase SDK loaded with ${features.join(', ')}`;
+        } catch (e) {
+          console.error(e);
+          loadEl.textContent = 'Error loading the Firebase SDK, check the console.';
+        }
+      });
+    </script>
+  </body>
+</html>