diff --git a/e2e/can-run-quiz.spec.ts b/e2e/can-run-quiz.spec.ts
index eec39d77..6fd075a5 100644
--- a/e2e/can-run-quiz.spec.ts
+++ b/e2e/can-run-quiz.spec.ts
@@ -63,19 +63,18 @@ test("question page should contain 4 options and `submit` button", async ({
   await page.getByRole("button", { name: "Submit", exact: true }).click();
 });
 
-test("selected option  must have 'answers-btns--selected' class", async ({
-  page
-}) => {
+test("selected first option must be checked", async ({ page }) => {
   await page.getByRole("button", { name: "HTML" }).click();
 
   await page.getByRole("button", { name: "10", exact: true }).click();
 
+  const firstOptionText = await page.getByRole("button").first().textContent();
   // Select the first option (no matter if it's right or wrong)
   await page.getByRole("button").first().click();
 
-  await expect(page.getByRole("button").first()).toHaveClass(
-    /answers-btns--selected/
-  );
+  // Check if the first radio is checked
+  const hiddenRadioButton = page.locator(`input[id='${firstOptionText}']`);
+  await expect(hiddenRadioButton).toBeChecked();
 });
 
 test("should show a modal after selecting one option and click the `submit` button", async ({
diff --git a/e2e/score-and-results.spec.ts b/e2e/score-and-results.spec.ts
index 56747093..bb136055 100644
--- a/e2e/score-and-results.spec.ts
+++ b/e2e/score-and-results.spec.ts
@@ -68,7 +68,7 @@ test("should show 'success' modal after selecting the correct option", async ({
   const questionData = await getQuestionData(question || "");
 
   const answer = questionData.Answer;
-  await page.getByRole("button", { name: answer }).click();
+  await page.getByRole("button", { name: answer, exact: true }).click();
   await page.getByRole("button", { name: "Submit", exact: true }).click();
 
   await verifyModalResponse(page, correctModalResponses, "1");
diff --git a/src/components/Selectable.tsx b/src/components/Selectable.tsx
new file mode 100644
index 00000000..550e965f
--- /dev/null
+++ b/src/components/Selectable.tsx
@@ -0,0 +1,32 @@
+import React from "react";
+
+const Selectable = ({
+  options,
+  groupName,
+  onChange
+}: {
+  options: string[];
+  groupName: string;
+  onChange: (val: string) => void;
+}) => {
+  return (
+    <ul className="select-btn-div">
+      {options.map((itm: string) => (
+        <li key={itm}>
+          <label className={"select-btns"} htmlFor={itm} role="button">
+            <input
+              type="radio"
+              id={itm}
+              name={groupName}
+              value={itm}
+              onChange={e => onChange(e.target.value)}
+            />
+
+            {itm}
+          </label>
+        </li>
+      ))}
+    </ul>
+  );
+};
+export default Selectable;
diff --git a/src/constants.ts b/src/constants.ts
index 79bea487..29816486 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -31,7 +31,8 @@ export const CATEGORIES = [
   "IT",
   "Linux",
   "Python",
-  "SQL"
+  "SQL",
+  "Random"
 ];
 
 export const ALL_CATEGORIES = [
diff --git a/src/pages/Questions.tsx b/src/pages/Questions.tsx
index 23ee2baa..dbb1b8be 100644
--- a/src/pages/Questions.tsx
+++ b/src/pages/Questions.tsx
@@ -3,6 +3,7 @@ import QuizModal from "../components/QuizModal";
 import React, { useEffect } from "react";
 
 import { QuizProps } from "../types";
+import Selectable from "../components/Selectable";
 
 const Questions: React.FC<QuizProps> = QuizProps => {
   const navigate = useNavigate();
@@ -20,43 +21,41 @@ const Questions: React.FC<QuizProps> = QuizProps => {
         <p>Points: {QuizProps.points}</p>
       </div>
       <h1 className="quiz-heading">Question {QuizProps.questionNumber}</h1>
-      <div className="quiz-div">
+      <form className="select-quiz-styles">
         {QuizProps.chooseAnswer ? (
           <QuizModal {...QuizProps.modalProps} />
         ) : (
-          <fieldset className="quiz-answers-div">
-            <legend>
-              <span className="sr-only">
-                Question {QuizProps.questionNumber}
-              </span>
-              {QuizProps.currQuestion.Question}
-            </legend>
-            <ul>
-              {QuizProps.choicesArr.length > 0 &&
-                QuizProps.choicesArr[QuizProps.questionNumber - 1].map(
-                  (choice: string, index: number) => (
-                    <li key={index}>
-                      <button
-                        className={`answers-btns ${choice === QuizProps.selectedOption ? `answers-btns--selected` : ``}`}
-                        onClick={() => QuizProps.selectOption(choice)}
-                      >
-                        {choice}
-                      </button>
-                    </li>
-                  )
-                )}
-            </ul>
-            <hr />
-            <button
-              className="select-btns submit-btn"
-              style={{ opacity: QuizProps.selectedOption ? 1 : 0.5 }}
-              onClick={() => QuizProps.checkAnswer()}
-            >
-              Submit
-            </button>
-          </fieldset>
+          <>
+            <fieldset className="quiz-answers-div">
+              <legend>
+                <span className="sr-only">
+                  Question {QuizProps.questionNumber}
+                </span>
+                {QuizProps.currQuestion.Question}
+              </legend>
+            </fieldset>
+
+            <Selectable
+              options={QuizProps.choicesArr[QuizProps.questionNumber - 1]}
+              groupName="answers"
+              onChange={(choice: string) => {
+                QuizProps.selectOption(choice);
+              }}
+            />
+
+            <fieldset className="quiz-answers-div">
+              <hr />
+              <button
+                className="select-btns submit-btn"
+                style={{ opacity: QuizProps.selectedOption ? 1 : 0.5 }}
+                onClick={() => QuizProps.checkAnswer()}
+              >
+                Submit
+              </button>
+            </fieldset>
+          </>
         )}
-      </div>
+      </form>
     </>
   );
 };
diff --git a/src/pages/SelectCategory.tsx b/src/pages/SelectCategory.tsx
index bd7597c8..662ef2b9 100644
--- a/src/pages/SelectCategory.tsx
+++ b/src/pages/SelectCategory.tsx
@@ -1,28 +1,21 @@
 import React from "react";
 import { CATEGORIES } from "../constants";
 import { SelectCategoryProps } from "../types";
+import Selectable from "../components/Selectable";
 
 const SelectCategory: React.FC<SelectCategoryProps> = SelectCategoryProps => {
   return (
     <div className="select-quiz-styles">
       <h2 className="quiz-heading">Choose a Category</h2>
-      <div className="select-btn-div">
-        {CATEGORIES.map((category: string, index: number) => (
-          <button
-            className="select-btns"
-            onClick={() => SelectCategoryProps.selectQuiz(category, index)}
-            key={index}
-          >
-            {category}
-          </button>
-        ))}
-        <button
-          className="select-btns"
-          onClick={SelectCategoryProps.startRandomQuiz}
-        >
-          Random
-        </button>
-      </div>
+      <Selectable
+        options={CATEGORIES}
+        groupName="categories"
+        onChange={category =>
+          category === "Random"
+            ? SelectCategoryProps.startRandomQuiz()
+            : SelectCategoryProps.selectQuiz(category, 0)
+        }
+      />
     </div>
   );
 };
diff --git a/src/pages/SelectQuestionsTotal.tsx b/src/pages/SelectQuestionsTotal.tsx
index c2ea384b..deaea42e 100644
--- a/src/pages/SelectQuestionsTotal.tsx
+++ b/src/pages/SelectQuestionsTotal.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { QUESTION_NUMS } from "../constants";
 import { SelectQuestionsTotalProps } from "../types";
+import Selectable from "../components/Selectable";
 
 const SelectQuestionsTotal: React.FC<SelectQuestionsTotalProps> = ({
   totalQuestions,
@@ -13,24 +14,18 @@ const SelectQuestionsTotal: React.FC<SelectQuestionsTotalProps> = ({
   return (
     <div className="select-quiz-styles">
       <h2 className="quiz-heading">Choose a length for the Quiz</h2>
-      <div className="select-btn-div">
-        {availableQuizLengths.map((choice: number, index: number) => (
-          <button
-            className="select-btns"
-            onClick={() => startQuiz(choice)}
-            key={index}
-          >
-            {choice}
-          </button>
-        ))}
 
-        <button
-          className="select-btns"
-          onClick={() => startQuiz(totalQuestions)}
-        >
-          All ({totalQuestions})
-        </button>
-      </div>
+      <Selectable
+        options={[
+          ...availableQuizLengths.map(n => `${n}`),
+          `All (${totalQuestions})`
+        ]}
+        groupName="QuizLengths"
+        onChange={(choice: string) => {
+          const num_choice = Number(choice.replace(/\D/g, ""));
+          startQuiz(num_choice);
+        }}
+      />
     </div>
   );
 };
diff --git a/src/stylesheets/App.css b/src/stylesheets/App.css
index 0a83f228..56312925 100644
--- a/src/stylesheets/App.css
+++ b/src/stylesheets/App.css
@@ -159,7 +159,7 @@ hr {
 
 @media screen and (min-width: 768px) {
   .select-btn-div {
-    width: 25%;
+    width: 50%;
     padding: 0;
   }
 }
diff --git a/src/stylesheets/Button.css b/src/stylesheets/Button.css
index 0a099ba7..370b34f5 100644
--- a/src/stylesheets/Button.css
+++ b/src/stylesheets/Button.css
@@ -37,6 +37,10 @@
   font-size: 25px;
 }
 
+label:has(input[type="radio"]:checked) {
+  background-color: var(--bg-answer-selected);
+}
+
 @media screen and (max-width: 480px) {
   .large-btn {
     width: 200px;
@@ -44,3 +48,15 @@
     font-size: 22px;
   }
 }
+
+ul,
+li {
+  list-style-type: none;
+  input[type="radio"] {
+    display: none;
+  }
+  label {
+    color: #0a0a23;
+    text-align: center;
+  }
+}