diff --git a/public/404.html b/404.html
similarity index 100%
rename from public/404.html
rename to 404.html
diff --git a/firebase.json b/firebase.json
index d612eab..63c48c3 100644
--- a/firebase.json
+++ b/firebase.json
@@ -3,7 +3,7 @@
     "rules": "database.rules.json"
   },
   "hosting": {
-    "public": "public",
+    "public": ".",
     "ignore": [
       "firebase.json",
       "**/.*",
diff --git a/index.css b/index.css
index 70c0c68..753d977 100644
--- a/index.css
+++ b/index.css
@@ -21,10 +21,10 @@ body {
   border: 2px solid #e6ba8f;
 }
 
-h1 {
+h1, h2 {
   color: #d35400;
   text-align: center;
-  margin-bottom: 20px;
+  margin: 20px 0;
 }
 
 form {
@@ -32,9 +32,7 @@ form {
   flex-direction: column;
 }
 
-input[type="text"],
-input[type="radio"],
-button {
+input[type="text"], input[type="radio"], button {
   margin: 10px 0;
   padding: 10px;
   border-radius: 5px;
@@ -60,37 +58,34 @@ button:disabled {
 ul {
   list-style: none;
   padding: 0;
+  margin-top: 20px;
 }
 
-li div {
+li {
+  position: relative;
   background: #ecf0f1;
-  margin-bottom: 5px;
-  padding: 5px;
+  margin-bottom: 10px;
   border-radius: 5px;
   overflow: hidden;
-  position: relative;
 }
 
-li div::before {
-  content: "";
-  position: absolute;
-  top: 0;
-  left: 0;
-  bottom: 0;
+li > div {
   background-color: #3498db;
-  transition: width 0.6s ease;
+  height: 100%;
+  border-radius: 5px 0 0 5px; /* Match the li border radius */
 }
 
-li div::after {
-  content: attr(data-content);
-  position: relative;
-  white-space: nowrap;
-  overflow: hidden;
-  display: block;
-  padding-left: 10px;
+li > span {
+  position: absolute;
+  z-index: 2;
+  left: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+  color: #000;
+  font-weight: bold;
 }
 
-#addOptionButton {
+#addOptionButton, #createPollButton {
   margin-top: 20px;
 }
 
@@ -99,15 +94,6 @@ li div::after {
   flex-direction: column;
 }
 
-.loading {
-  display: none; /* Hidden by default, display when loading */
-  position: absolute;
-  z-index: 1000;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-}
-
 footer {
   position: absolute;
   right: 10px;
@@ -115,3 +101,26 @@ footer {
   padding: 10px;
   text-align: right;
 }
+
+.vote-option {
+  display: block;
+  padding: 10px;
+  margin: 5px 0;
+  background-color: #f0f0f0;
+  border-radius: 5px;
+  cursor: pointer;
+  border: 2px solid transparent; /* To maintain layout on focus */
+}
+
+.vote-option:hover {
+  background-color: #e8e8e8;
+}
+
+.vote-option input[type="radio"] {
+  margin-right: 10px;
+}
+
+/* Style adjustments for when the radio is checked, optional */
+.vote-option input[type="radio"]:checked + span {
+  font-weight: bold;
+}
diff --git a/index.html b/index.html
index 37fab5f..68b64ac 100644
--- a/index.html
+++ b/index.html
@@ -60,19 +60,20 @@
           let html = `<h1>${pollData.question}</h1>`;
           pollData.options.forEach((option, index) => {
             html += `
-        <div>
-          <input type="radio" id="option${index}" name="vote" value="${option}">
-          <label for="option${index}">${option}</label>
-        </div>
-      `;
+      <label class="vote-option" for="option${index}">
+        <input type="radio" id="option${index}" name="vote" value="${option}">
+        ${option}
+      </label>
+    `;
           });
-          // Add a submit button
-          html += `<button id="submitVoteButton">Vote</button>`;
+          html += `<button id="submitVoteButton" style="margin-right: 0.5rem;">Vote</button>`;
+          html += `<button id="goResultsButton">Results</button>`;
           // Display the HTML in the 'content' div
           document.getElementById('content').innerHTML = html;
 
           // Add the event listener to the button
           document.getElementById('submitVoteButton').addEventListener('click', () => submitVote(pollId));
+          document.getElementById('goResultsButton').addEventListener('click', () => window.location.href = `?page=results&pollId=${pollId}`);
         } else {
           document.getElementById('content').innerHTML = 'Poll not found.';
         }
@@ -132,6 +133,8 @@
             // Display a message if there are no votes
             contentDiv.innerHTML = 'No votes have been cast yet.';
           }
+
+          html += `<button id="goVotePageButton">Vote</button>`;
         } else {
           contentDiv.innerHTML = 'Poll not found.';
         }
diff --git a/public/index.html b/public/index.html
deleted file mode 100644
index db38502..0000000
--- a/public/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!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.8.0/firebase-app-compat.js"></script>
-    <!-- include only the Firebase features as you need -->
-    <script defer src="/__/firebase/10.8.0/firebase-auth-compat.js"></script>
-    <script defer src="/__/firebase/10.8.0/firebase-database-compat.js"></script>
-    <script defer src="/__/firebase/10.8.0/firebase-firestore-compat.js"></script>
-    <script defer src="/__/firebase/10.8.0/firebase-functions-compat.js"></script>
-    <script defer src="/__/firebase/10.8.0/firebase-messaging-compat.js"></script>
-    <script defer src="/__/firebase/10.8.0/firebase-storage-compat.js"></script>
-    <script defer src="/__/firebase/10.8.0/firebase-analytics-compat.js"></script>
-    <script defer src="/__/firebase/10.8.0/firebase-remote-config-compat.js"></script>
-    <script defer src="/__/firebase/10.8.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>