diff --git a/DISCUSSION.md b/DISCUSSION.md
index e69de29..f3db593 100644
--- a/DISCUSSION.md
+++ b/DISCUSSION.md
@@ -0,0 +1,12 @@
+# Remaining improvements
+
+## Database
+Instead of searching the whole database and then filtering it, we should use the search terms to search the database specifically for those terms.
+
+## Table width
+
+The table width needs to be reformatted to fit into window for phone and tablet sizes
+
+## Specialties field
+The Specialties fields style can be improved by bullet-listing the specialties
+
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 11a598f..88e32c4 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,10 +1,23 @@
 "use client";
 
-import { useEffect, useState } from "react";
+import { useEffect, useState, useRef } from "react";
+
+interface Advocate {
+  id: number;
+  firstName: string;
+  lastName: string;
+  city: string;
+  degree: string;
+  specialties: string[];
+  yearsOfExperience: number;
+  phoneNumber: number;
+  createdAt?: string;
+}
 
 export default function Home() {
-  const [advocates, setAdvocates] = useState([]);
-  const [filteredAdvocates, setFilteredAdvocates] = useState([]);
+  const [advocates, setAdvocates] = useState<Advocate[]>([]);
+  const [filteredAdvocates, setFilteredAdvocates] = useState<Advocate[]>([]);
+  const inputRef = useRef<HTMLInputElement>(null);
 
   useEffect(() => {
     console.log("fetching advocates...");
@@ -16,20 +29,24 @@ export default function Home() {
     });
   }, []);
 
-  const onChange = (e) => {
+  const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const searchTerm = e.target.value;
 
-    document.getElementById("search-term").innerHTML = searchTerm;
+    const searchTermElement = document.getElementById("search-term");
+    if (searchTermElement) {
+      searchTermElement.innerHTML = searchTerm;
+    }
 
     console.log("filtering advocates...");
     const filteredAdvocates = advocates.filter((advocate) => {
+      const lowerSearchTerm = searchTerm.toLowerCase();
       return (
-        advocate.firstName.includes(searchTerm) ||
-        advocate.lastName.includes(searchTerm) ||
-        advocate.city.includes(searchTerm) ||
-        advocate.degree.includes(searchTerm) ||
-        advocate.specialties.includes(searchTerm) ||
-        advocate.yearsOfExperience.includes(searchTerm)
+        advocate.firstName.toLowerCase().includes(lowerSearchTerm) ||
+        advocate.lastName.toLowerCase().includes(lowerSearchTerm) ||
+        advocate.city.toLowerCase().includes(lowerSearchTerm) ||
+        advocate.degree.toLowerCase().includes(lowerSearchTerm) ||
+        advocate.specialties.some(specialty => specialty.toLowerCase().includes(lowerSearchTerm)) ||
+        advocate.yearsOfExperience.toString().includes(searchTerm)
       );
     });
 
@@ -39,48 +56,59 @@ export default function Home() {
   const onClick = () => {
     console.log(advocates);
     setFilteredAdvocates(advocates);
+    
+    // Clear the input field
+    if (inputRef.current) {
+      inputRef.current.value = "";
+    }
+    
+    // Clear the search term display
+    const searchTermElement = document.getElementById("search-term");
+    if (searchTermElement) {
+      searchTermElement.innerHTML = "";
+    }
   };
 
   return (
     <main style={{ margin: "24px" }}>
-      <h1>Solace Advocates</h1>
-      <br />
-      <br />
-      <div>
-        <p>Search</p>
-        <p>
+      <div className="w-full">
+        <h1 className="text-xl md:text-3xl text-white font-bold bg-green-700 px-4 py-5 rounded-md mb-8 w-full">Solace Advocates</h1>
+      </div>
+      <div className="mb-8">
+        <p className="text-lg md:text-2xl font-bold mb-2">Search</p>
+        <p className="text-sm md:text-lg">
           Searching for: <span id="search-term"></span>
         </p>
-        <input style={{ border: "1px solid black" }} onChange={onChange} />
-        <button onClick={onClick}>Reset Search</button>
+                  <input ref={inputRef} style={{ border: "1px solid black" }} onChange={onChange} className="w-1/2 md:w-1/3" />
+        <button onClick={onClick} className="bg-green-700 text-white px-2 md:px-4 py-2 rounded-md ml-2 text-sm md:text-lg">Reset Search</button>
       </div>
-      <br />
-      <br />
       <table>
         <thead>
-          <th>First Name</th>
-          <th>Last Name</th>
-          <th>City</th>
-          <th>Degree</th>
-          <th>Specialties</th>
-          <th>Years of Experience</th>
-          <th>Phone Number</th>
+          <tr>
+            <th className="whitespace-nowrap text-xs md:text-sm px-2 md:px-4">First Name</th>
+            <th className="whitespace-nowrap text-xs md:text-sm px-2 md:px-4">Last Name</th>
+            <th className="whitespace-nowrap text-xs md:text-sm px-2 md:px-4">City</th>
+            <th className="whitespace-nowrap text-xs md:text-sm px-2 md:px-4">Degree</th>
+            <th className="whitespace-nowrap text-xs md:text-sm px-2 md:px-4">Specialties</th>
+            <th className="whitespace-nowrap text-xs md:text-sm px-2 md:px-4">Years of Experience</th>
+            <th className="whitespace-nowrap text-xs md:text-sm px-2 md:px-4">Phone Number</th>
+          </tr>
         </thead>
         <tbody>
-          {filteredAdvocates.map((advocate) => {
+          {filteredAdvocates.map((advocate, index) => {
             return (
-              <tr>
-                <td>{advocate.firstName}</td>
-                <td>{advocate.lastName}</td>
-                <td>{advocate.city}</td>
-                <td>{advocate.degree}</td>
-                <td>
-                  {advocate.specialties.map((s) => (
-                    <div>{s}</div>
+              <tr key={advocate.id} className={index % 2 === 0 ? "bg-gray-100" : "bg-gray-300"}>
+                <td className="align-top px-2 md:px-4">{advocate.firstName}</td>
+                <td className="align-top px-2 md:px-4">{advocate.lastName}</td>
+                <td className="align-top px-2 md:px-4">{advocate.city}</td>
+                <td className="align-top px-2 md:px-4">{advocate.degree}</td>
+                <td className="align-top">
+                  {advocate.specialties.map((s: string, index: number) => (
+                    <div key={index}>{s}</div>
                   ))}
                 </td>
-                <td>{advocate.yearsOfExperience}</td>
-                <td>{advocate.phoneNumber}</td>
+                <td className="align-top px-2 md:px-4">{advocate.yearsOfExperience}</td>
+                <td className="align-top px-2 md:px-4">{advocate.phoneNumber}</td>
               </tr>
             );
           })}