diff --git a/src/static_site_generator.py b/src/static_site_generator.py
index 38ee416..56bac63 100644
--- a/src/static_site_generator.py
+++ b/src/static_site_generator.py
@@ -1,28 +1,34 @@
 from jinja2 import Environment, FileSystemLoader
+import logging 
 
-# Example data
-GENERATOR_DATA = {
-    'title': 'Version Two',
-    'github_user': 'octocat',
-    'team': 'Platform Engineering',
-    'tasks': []
-}
 
-def generate_site(data=None, output_file='./_site/index.html'):
-    env = Environment(loader=FileSystemLoader('templates'))
-    template = env.get_template('kaban_board.html')
+class StaticSiteGenerator():
 
-    GENERATOR_DATA["tasks"] = data if data is not None else []
+    def __init__(self):
+        self.GENERATOR_DATA = {
+            'title': 'Version Two',
+            'github_user': 'octocat',
+            'team': 'Platform Engineering',
+            'tasks': []
+        }
 
-    # Extract unique statuses from the tasks list
-    unique_statuses = sorted({task["status"] for task in GENERATOR_DATA["tasks"]})
-    
-    # Add statuses to the data dictionary
-    data_with_statuses = {**GENERATOR_DATA, "statuses": unique_statuses}
-    
-    # Render template with updated data
-    output = template.render(data_with_statuses)
-    
-    with open(output_file, 'w') as f:
-        f.write(output)
+    def generate_site(self, data=None, output_file='./_site/index.html'):
+        logging.info("Generating Static Site")
+        env = Environment(loader=FileSystemLoader('templates'))
+        template = env.get_template('kaban_board.html')
 
+        self.GENERATOR_DATA["tasks"] = data if data is not None else []
+
+        # Extract unique statuses from the tasks list
+        unique_statuses = sorted({task["status"] for task in self.GENERATOR_DATA["tasks"]})
+        
+        # Add statuses to the data dictionary
+        data_with_statuses = {**self.GENERATOR_DATA, "statuses": unique_statuses}
+        
+        # Render template with updated data
+        output = template.render(data_with_statuses)
+        
+        with open(output_file, 'w') as f:
+            f.write(output)
+
+        logging.info("Static Site Generated @ ./_site/index.html")
diff --git a/templates/kaban_board.html b/templates/kaban_board.html
index d55f0b3..2a7759c 100644
--- a/templates/kaban_board.html
+++ b/templates/kaban_board.html
@@ -41,88 +41,94 @@ <h1 class="mb-3 text-center">{{ title }}</h1>
             <!-- <div class="col-md-4">
                 <p><strong>Team:</strong> {{ team }}</p>
             </div> -->
-            <div class="col-md-4">
-                <input type="text" id="searchBox" class="form-control" placeholder="Search tasks...">
+            <div class="search-bar col-md-4">
+                <input type="text" id="search-input" class="form-control" placeholder="Search tasks..." />
             </div>
+            
         </div>
     </div>
 
     <div class="container-fluid py-4">
         <!-- Kanban Board -->
         <div class="row row-cols-1 row-cols-md-5 g-3">
-            {% set counter = 0 %}
             {% for status in statuses %}
-            <div class="col">
-                <div class="kanban-column">
-                    <div class="kanban-header text-primary text-center">{{ status }}</div>
-                    {% for task in tasks if task.status == status %}
-                    
-                    <div class="kanban-card">
-                        {% set card_id = "card-" ~ status | lower | replace(" ", "-") ~ "-" ~ counter %}
-                        {% set counter = counter + 1 %}
-                        <div class="d-flex align-items-start gap-2">
-                            <a 
-                                href="{{ task.content.url }}" 
-                                target="_blank" 
-                                class="text-primary text-decoration-none fw-bold"
-                            >
-                            🟢 #{{ task.content.number }}
-                            </a>
-                            <a 
-                                class="text-dark text-decoration-none fw-bold flex-grow-1" 
-                                data-bs-toggle="collapse" 
-                                href="#{{ card_id }}" 
-                                role="button" 
-                                aria-expanded="false" 
-                                aria-controls="{{ card_id }}"
-                            >
-                                {{ task.title }}
-                            </a>
+        <div class="col">
+            <div class="kanban-column">
+                <div class="kanban-header text-primary text-center">{{ status }}</div>
+
+                {% for task in tasks if task.status == status %}
+                {% set card_id = "card-" ~ status | lower | replace(" ", "-") ~ "-" ~ loop.index0 %}
+
+                <div class="kanban-card">
+                    <div class="d-flex flex-column align-items-start gap-2">
+                        <a 
+                            class="text-dark text-decoration-none fw-bold flex-grow-1"  
+                            data-bs-toggle="collapse" 
+                            href="#{{ card_id }}" 
+                            role="button" 
+                            aria-expanded="false" 
+                            aria-controls="{{ card_id }}"
+                        >
+                        🟢 {{ task.title }}<a 
+                        href="{{ task.content.url }}" 
+                        target="_blank" 
+                        class="fs-8 text-primary text-decoration-none">
+                            (#{{ task.content.number }})</a>
+                        </a>
+                    </div>
+                    <div class="collapse mt-2" id="{{ card_id }}">
+                        <div>
+                            <small>
+                                <strong>📦 Repository:</strong>
+                                <a href="{{ task.repository }}" target="_blank">
+                                    {{ task.content.repository }}
+                                </a>
+                            </small>
                         </div>
-                        <div class="collapse mt-2" id="{{ card_id }}">
-                            <!-- <div><small><strong>Issue #:</strong> {{ task.content.number }}</small></div> -->
-                            <div>
-                                <small>
-                                    <strong>📦 Repository:</strong>
-                                    <a href="{{ task.repository }}" target="_blank">
-                                        {{ task.content.repository }}
-                                    </a>
-                                </small>
-                            </div>
-                            <div><small><strong>👤 Assignee:</strong> {{ task.assignees | join(', ') }}</small></div>
-                            <div><small><strong>🏷️ Labels:</strong> {{ task.labels | join(', ') }}</small></div>
-                            <div><small><strong>📌 Status:</strong> {{ task.status }}</small></div>
-                            <div class="text-center">
-                                <a href="{{ task.content.url }}" target="_blank" class="btn btn-sm btn-outline-primary mt-2">View Issue</a>
-                            </div>
+                        <div><small><strong>👤 Assignee:</strong> {{ task.assignees | join(', ') }}</small></div>
+                        <div><small><strong>🏷️ Labels:</strong> {{ task.labels | join(', ') }}</small></div>
+                        <div><small><strong>📌 Status:</strong> {{ task.status }}</small></div>
+                        <div class="text-center">
+                            <a href="{{ task.content.url }}" target="_blank" class="btn btn-sm btn-outline-primary mt-2">View Issue</a>
                         </div>
                     </div>
-                    {% endfor %}
                 </div>
+                {% endfor %}
             </div>
-            {% endfor %}
+        </div>
+        {% endfor %}
         </div>
     </div>
 
 
 
 
-    <script>
-        document.addEventListener("DOMContentLoaded", function () {
-            const searchInput = document.querySelector("#searchBox");
-    
-            searchInput.addEventListener("input", function () {
-                const searchTerm = this.value.toLowerCase();
-                const cards = document.querySelectorAll(".kanban-card");
-    
-                cards.forEach(card => {
-                    const title = card.querySelector("strong").textContent.toLowerCase();
-                    const description = card.querySelector("small").textContent.toLowerCase();
-    
-                    if (title.includes(searchTerm) || description.includes(searchTerm)) {
-                        card.style.display = "block";
+<script>
+        document.addEventListener("DOMContentLoaded", function() {
+            // Get the search input and all Kanban cards
+            const searchInput = document.getElementById('search-input');
+            const kanbanCards = document.querySelectorAll('.kanban-card');
+            
+            // Add an event listener for the search input
+            searchInput.addEventListener('input', function() {
+                const query = searchInput.value.toLowerCase(); // Get the lowercase version of the query
+                
+                // Iterate over all the cards
+                kanbanCards.forEach(function(card) {
+                    // Get the card's title, issue number, and other text content to check if it matches the query
+                    const title = card.querySelector('.d-flex .text-dark').textContent.toLowerCase();
+                    const issueNumber = card.querySelector('.d-flex .text-primary').textContent.toLowerCase();
+                    const repository = card.querySelector('.text-muted') ? card.querySelector('.text-muted').textContent.toLowerCase() : '';
+                    const assignee = card.querySelector('.d-flex .assignee') ? card.querySelector('.d-flex .assignee').textContent.toLowerCase() : '';
+
+                    // Check if the query matches any part of the task (title, issue number, repository, assignee)
+                    const matches = title.includes(query) || issueNumber.includes(query) || repository.includes(query) || assignee.includes(query);
+                    
+                    // Show or hide the card based on the search query match
+                    if (matches) {
+                        card.style.display = 'block'; // Show the card
                     } else {
-                        card.style.display = "none";
+                        card.style.display = 'none'; // Hide the card
                     }
                 });
             });
diff --git a/version2.py b/version2.py
index 364f171..cc89f47 100644
--- a/version2.py
+++ b/version2.py
@@ -1,8 +1,9 @@
 from src.version2config import VersionTwoConfig
 from src.version2query import Version2Query
-from src.static_site_generator import generate_site
+from src.static_site_generator import StaticSiteGenerator
 from pathlib import Path
 import json
+import logging
 
 def main():
     config:VersionTwoConfig = VersionTwoConfig()
@@ -12,10 +13,12 @@ def main():
     teams:list[str] = config.include_team
 
     query:VersionTwoQuery = Version2Query(temp_dir=temp_dir, output_file=output_file)
+    ss_gen = StaticSiteGenerator()
 
     # Generate output_file or die
+    logging.info("Querying GitHub API...")
     if not query.process(teams):
-      print("Failed to process query.")
+      logging.error("Failed to process query.")
       return
 
     # Get json object
@@ -23,7 +26,7 @@ def main():
     with open(output_file, 'r') as f:
       data = json.load(f)
 
-    generate_site(data=data)
+    ss_gen.generate_site(data=data)
 
 if __name__ == "__main__":
     main()