diff --git a/app/(loggedIn)/settings/form.tsx b/app/(loggedIn)/settings/form.tsx
index 2ea78d3a..29c468e8 100644
--- a/app/(loggedIn)/settings/form.tsx
+++ b/app/(loggedIn)/settings/form.tsx
@@ -3,57 +3,42 @@
 import { useEffect, useState } from "react";
 import getUserSettings from "../../../utils/api/getUserSettings";
 
+let defaultState = {
+  AISummary: 1,
+  CodeComments: 1,
+  Badges: 1,
+  SearchAmount: 3,
+  ResponseTexts: 1,
+};
 export default function form({ userEmail }) {
   const [saveDisabled, setSaveDisabled] = useState(false);
+  const [formState, setFormState] = useState(defaultState);
+
+  useEffect(() => {
+    setUserSettingsState(userEmail);
+  }, [userEmail]);
 
   const setUserSettingsState = async (userEmail) => {
     let settings = await getUserSettings(userEmail);
     setFormState(settings);
   };
-  const services = [
-    {
-      valueLabel: "JiraTickets",
-      label: "Jira Tickets",
-    },
-    {
-      valueLabel: "SlackMessages",
-      label: "Slack Messages",
-    },
-    {
-      valueLabel: "GitHubPRs",
-      label: "GitHub PRs",
-    },
-    {
-      valueLabel: "NotionPages",
-      label: "Notion Pages",
-    },
-    {
-      valueLabel: "LinearTickets",
-      label: "Linear Tickets",
-    },
-    {
-      valueLabel: "ConfluenceDocs",
-      label: "Confluence Docs",
-    },
-    {
-      valueLabel: "AsanaTasks",
-      label: "Asana Tasks",
-    },
-  ];
-  let defaultState = {
-    AISummary: 1,
+  const setDefault = () => {
+    setFormState(defaultState);
   };
-  services.map((service) => (defaultState[service.valueLabel] = 3));
-  const [formState, setFormState] = useState(defaultState);
-  const handleSubmit = async () => {
+  const handleSubmit = async (e) => {
     setSaveDisabled(true);
+    e.preventDefault();
+
     try {
       const response = await fetch("/api/user/updateSettings", {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
         },
-        body: JSON.stringify({ userSettings: formState, email: userEmail }),
+        body: JSON.stringify({
+          userSettings: formState,
+          email: userEmail,
+        }),
       }).then((res) => setUserSettingsState(userEmail));
     } catch (error) {
       console.error("An error occurred while saving the form", error);
@@ -61,72 +46,105 @@ export default function form({ userEmail }) {
       setSaveDisabled(false);
     }
   };
-  useEffect(() => {
-    setUserSettingsState(userEmail);
-  }, [userEmail]);
-
-  function SettingsSelector({ label, valueLabel }) {
-    return (
-      <div style={{ display: "flex", alignItems: "center" }}>
-        {" "}
-        <span style={{ width: "100px" }}>{label}</span>{" "}
-        <select
-          className="form-select mt-2"
-          aria-label={label}
-          defaultValue={formState[valueLabel]}
-          onChange={(e) =>
-            setFormState({
-              ...formState,
-              [valueLabel]: parseInt(e.target.value),
-            })
-          }
-          value={formState[valueLabel]}
-        >
-          {" "}
-          {Array.from({ length: 5 }, (_, index) => (
-            <option key={index} value={index + 1}>
-              {" "}
-              {index + 1}{" "}
-            </option>
-          ))}{" "}
-        </select>{" "}
-      </div>
-    );
-  }
-  return (
-    <form>
-      {services.map((service) => (
-        <SettingsSelector
-          key={service.valueLabel}
-          valueLabel={service.valueLabel}
-          label={service.label}
-        />
-      ))}
-      <div style={{ display: "flex", alignItems: "center" }}>
-        <span>AI Summary: </span>
+  const handleChange = (e) => {
+    setFormState({ ...formState, [e.target.name]: e.target.value });
+  };
+  const ActivationDropdown = ({ name, ariaLabel, formStateName }) => (
+    <div>
+      <label htmlFor={`name`} className="d-flex flex-items-center">
+        {ariaLabel}:
         <select
           className="form-select ml-3 mt-2"
-          aria-label="AI Summary"
-          value={formState.AISummary}
-          onChange={(e) =>
-            setFormState({
-              ...formState,
-              AISummary: parseInt(e.target.value),
-            })
-          }
+          aria-label={ariaLabel}
+          id={name}
+          onChange={handleChange}
+          value={formState[formStateName]}
+          name={name}
         >
           <option value={1}>Active</option>
           <option value={0}>Inactive</option>
         </select>
+      </label>
+    </div>
+  );
+
+  return (
+    <form onSubmit={handleSubmit}>
+      <div>
+        <div
+          className="Subhead"
+          title="This is a tooltip that if hovered will explain what it does"
+        >
+          <h3 className="Subhead-heading">Watermelon AI</h3>
+        </div>
+        <div style={{ display: "flex", alignItems: "center" }}>
+          <div className="form-group-header">
+            <h4>PR Comment</h4>
+          </div>
+        </div>
+        <ActivationDropdown
+          name="AISummary"
+          ariaLabel="AI Summary"
+          formStateName="AISummary"
+        />
+        <ActivationDropdown
+          name="CodeComments"
+          ariaLabel="Code Comments"
+          formStateName="CodeComments"
+        />
+        <ActivationDropdown
+          name="Badges"
+          ariaLabel="Badges"
+          formStateName="Badges"
+        />
       </div>
-      <button
-        className="btn btn-primary"
-        type="button"
-        disabled={saveDisabled}
-        onClick={handleSubmit}
+      <div>
+        <div
+          className="Subhead"
+          title="This is a tooltip that if hovered will explain what it does"
+        >
+          <h3 className="Subhead-heading">Search results</h3>
+        </div>
+        <label htmlFor={`SearchAmount`} className="d-flex flex-items-center">
+          Number of results per platform:
+          <select
+            className="form-select select-sm mt-2"
+            onChange={handleChange}
+            value={formState.SearchAmount}
+            name={`SearchAmount`}
+            id={`SearchAmount`}
+            style={{ width: "15ch" }}
+          >
+            {Array.from({ length: 5 }, (_, index) => (
+              <option key={index} value={index + 1}>
+                {index + 1}
+              </option>
+            ))}
+          </select>
+        </label>
+
+        <ActivationDropdown
+          name="ResponseTexts"
+          ariaLabel="Response Texts"
+          formStateName="ResponseTexts"
+        />
+      </div>
+
+      <div
+        className="d-flex flex-row-reverse"
+        style={{ bottom: "1rem", right: "1rem", position: "sticky", zIndex: 3 }}
       >
-        {saveDisabled ? "Saving..." : "Save"}
-      </button>
+        <button
+          className="btn btn-primary"
+          type="submit"
+          disabled={saveDisabled}
+        >
+          {saveDisabled ? "Saving..." : "Save"}
+        </button>
+        <button type="button" className="btn mx-2" onClick={setDefault}>
+          Reset to default
+        </button>
+      </div>
     </form>
   );
 }
diff --git a/app/api/actions/github/route.ts b/app/api/actions/github/route.ts
index ccc2b1c9..834bf752 100644
--- a/app/api/actions/github/route.ts
+++ b/app/api/actions/github/route.ts
@@ -26,8 +26,6 @@ import randomText from "../../../../utils/actions/markdownHelpers/randomText";
 import createTeamAndMatchUser from "../../../../utils/db/teams/createTeamAndMatchUser";
 import sendUninstall from "../../../../utils/sendgrid/sendUninstall";
 
-
-
 const app = new App({
   appId: process.env.GITHUB_APP_ID!,
   privateKey: process.env.GITHUB_PRIVATE_KEY!,
@@ -70,7 +68,7 @@ export async function POST(request: Request) {
 
       if (pull_request.user.type === "Bot") {
         return new Response("We don't comment on bot PRs", {
-          status: 400
+          status: 400,
         });
       }
 
@@ -313,6 +311,9 @@ export async function POST(request: Request) {
         watermelon_user,
         AISummary,
         user_email,
+        ResponseTexts,
+        CodeComments,
+        Badges,
       } = serviceAnswers;
       if (error) {
         return failedToFetchResponse({
@@ -381,42 +382,49 @@ export async function POST(request: Request) {
       textToWrite += generalMarkdownHelper({
         value: github,
         userLogin,
+        ResponseTexts,
         systemName: "GitHub",
         systemResponseName: "GitHub PRs",
       });
       textToWrite += generalMarkdownHelper({
         value: jira,
         userLogin,
+        ResponseTexts,
         systemName: "Jira",
         systemResponseName: "Jira Tickets",
       });
       textToWrite += generalMarkdownHelper({
         value: confluence,
         userLogin,
+        ResponseTexts,
         systemName: "Confluence",
         systemResponseName: "Confluence Docs",
       });
       textToWrite += generalMarkdownHelper({
         value: slack,
         userLogin,
+        ResponseTexts,
         systemName: "Slack",
         systemResponseName: "Slack Threads",
       });
       textToWrite += generalMarkdownHelper({
         value: notion,
         userLogin,
+        ResponseTexts,
         systemName: "Notion",
         systemResponseName: "Notion Pages",
       });
       textToWrite += generalMarkdownHelper({
         value: linear,
         userLogin,
+        ResponseTexts,
         systemName: "Linear",
         systemResponseName: "Linear Tickets",
       });
       textToWrite += generalMarkdownHelper({
         value: asana,
         userLogin,
+        ResponseTexts,
         systemName: "Asana",
         systemResponseName: "Asana Tasks",
       });
@@ -428,27 +436,31 @@ export async function POST(request: Request) {
       textToWrite += randomText();
       Promise.all([
         // Detect console.logs and its equivalent in other languages
-        detectConsoleLogs({
-          prTitle: title,
-          businessLogicSummary,
-          repo,
-          owner,
-          issue_number: number,
-          installationId,
-          reqUrl: request.url,
-          reqEmail: req.email,
-        }),
+        CodeComments
+          ? detectConsoleLogs({
+              prTitle: title,
+              businessLogicSummary,
+              repo,
+              owner,
+              issue_number: number,
+              installationId,
+              reqUrl: request.url,
+              reqEmail: req.email,
+            })
+          : null,
         // Make Watermelon Review the PR's business logic here by comparing the title with the AI-generated summary
-        labelPullRequest({
-          prTitle: title,
-          businessLogicSummary,
-          repo,
-          owner,
-          issue_number: number,
-          installationId,
-          reqUrl: request.url,
-          reqEmail: req.email,
-        }),
+        Badges
+          ? labelPullRequest({
+              prTitle: title,
+              businessLogicSummary,
+              repo,
+              owner,
+              issue_number: number,
+              installationId,
+              reqUrl: request.url,
+              reqEmail: req.email,
+            })
+          : null,
         addActionLog({
           randomWords,
           github,
@@ -557,7 +569,9 @@ export async function POST(request: Request) {
 
         // Find our bot's comment
         let botComment = comments.data.find((comment) => {
-          return comment?.user?.login.includes("watermelon-copilot-for-code-review");
+          return comment?.user?.login.includes(
+            "watermelon-copilot-for-code-review"
+          );
         });
 
         // Update the existing comment
diff --git a/components/Navbar.tsx b/components/Navbar.tsx
index f122cbc7..b8d80a74 100644
--- a/components/Navbar.tsx
+++ b/components/Navbar.tsx
@@ -13,9 +13,19 @@ export default function Navbar({ children }: { children: React.ReactNode }) {
     { href: "/api/auth/signout", label: "Logout", onClick: signOut },
   ];
   return (
-    <div className="d-flex flex-row h-full">
-      <nav className="SideNav shadow-md" style={{ width: 250 }}>
-        <div className="flex flex-col justify-between h-full bg-gray-100 p-4">
+    <div className="d-flex flex-row h-full" style={{ minHeight: "90vh" }}>
+      <nav
+        className="SideNav shadow-md"
+        style={{ width: 250, minHeight: "100%" }}
+      >
+        <div
+          className="flex flex-col justify-between h-full bg-gray-100 p-4"
+          style={{
+            position: "sticky",
+            top: 0,
+            zIndex: 2,
+          }}
+        >
           <div>
             {links.map(({ href, label }) => (
               <Link
diff --git a/utils/actions/getAllServices.ts b/utils/actions/getAllServices.ts
index 5d78aa07..1487652d 100644
--- a/utils/actions/getAllServices.ts
+++ b/utils/actions/getAllServices.ts
@@ -48,13 +48,10 @@ export default async function getAllServices({
         asana_workspace,
         user_email,
         AISummary,
-        JiraTickets,
-        GitHubPRs,
-        SlackMessages,
-        NotionPages,
-        LinearTickets,
-        ConfluencePages,
-        AsanaTasks,
+        SearchAmount,
+        ResponseTexts,
+        Badges,
+        CodeComments,
         watermelon_user,
       } = wmUserData;
       const [github, jira, confluence, slack, notion, linear, asana] =
@@ -64,14 +61,14 @@ export default async function getAllServices({
             owner,
             github_token,
             randomWords,
-            amount: GitHubPRs,
+            amount: SearchAmount,
           }),
           getJira({
             user: user_email,
             token: jira_token,
             refresh_token: jira_refresh_token,
             randomWords,
-            amount: JiraTickets,
+            amount: SearchAmount,
           }),
           getConfluence({
             token: confluence_token,
@@ -79,29 +76,29 @@ export default async function getAllServices({
             cloudId: confluence_id,
             user: user_email,
             randomWords,
-            amount: ConfluencePages,
+            amount: SearchAmount,
           }),
           getSlack({
             slack_token,
             searchString: randomWords.join(" "),
-            amount: SlackMessages,
+            amount: SearchAmount,
           }),
           getNotion({
             notion_token,
             randomWords,
-            amount: NotionPages,
+            amount: SearchAmount,
           }),
           getLinear({
             linear_token,
             randomWords,
-            amount: LinearTickets,
+            amount: SearchAmount,
           }),
           getAsana({
             access_token: asana_token,
             user: user_email,
             randomWords,
             workspace: asana_workspace,
-            amount: AsanaTasks,
+            amount: SearchAmount,
           }),
         ]);
 
@@ -115,6 +112,10 @@ export default async function getAllServices({
         asana,
         watermelon_user,
         AISummary,
+        ResponseTexts,
+        SearchAmount,
+        Badges,
+        CodeComments,
         user_email,
       };
     } catch (error) {
@@ -148,13 +149,10 @@ export default async function getAllServices({
         asana_workspace,
         user_email,
         AISummary,
-        JiraTickets,
-        GitHubPRs,
-        SlackMessages,
-        NotionPages,
-        LinearTickets,
-        ConfluencePages,
-        AsanaTasks,
+        CodeComments,
+        Badges,
+        SearchAmount,
+        ResponseTexts,
         watermelon_user,
       } = wmUserData;
       if (!watermelon_user) {
@@ -164,7 +162,7 @@ export default async function getAllServices({
             owner,
             installationId,
             randomWords,
-            amount: GitHubPRs,
+            amount: SearchAmount,
           }),
         ]);
         return {
@@ -177,13 +175,8 @@ export default async function getAllServices({
           slack: { error: "no slack token", data: [], fullData: [] },
           watermelon_user: "team",
           AISummary,
-          JiraTickets,
-          GitHubPRs,
-          SlackMessages,
-          NotionPages,
-          LinearTickets,
-          ConfluencePages,
-          AsanaTasks,
+          ResponseTexts,
+          SearchAmount,
         };
       } else {
         const [github, jira, confluence, slack, notion, linear, asana] =
@@ -193,14 +186,14 @@ export default async function getAllServices({
               owner,
               github_token,
               randomWords,
-              amount: GitHubPRs,
+              amount: SearchAmount,
             }),
             getJira({
               user: user_email,
               token: jira_token,
               refresh_token: jira_refresh_token,
               randomWords,
-              amount: JiraTickets,
+              amount: SearchAmount,
             }),
             getConfluence({
               token: confluence_token,
@@ -208,29 +201,29 @@ export default async function getAllServices({
               cloudId: confluence_id,
               user: user_email,
               randomWords,
-              amount: ConfluencePages,
+              amount: SearchAmount,
             }),
             getSlack({
               slack_token,
               searchString: randomWords.join(" "),
-              amount: SlackMessages,
+              amount: SearchAmount,
             }),
             getNotion({
               notion_token,
               randomWords,
-              amount: NotionPages,
+              amount: SearchAmount,
             }),
             getLinear({
               linear_token,
               randomWords,
-              amount: LinearTickets,
+              amount: SearchAmount,
             }),
             getAsana({
               access_token: asana_token,
               user: user_email,
               randomWords,
               workspace: asana_workspace,
-              amount: AsanaTasks,
+              amount: SearchAmount,
             }),
           ]);
 
@@ -244,6 +237,10 @@ export default async function getAllServices({
           asana,
           watermelon_user,
           AISummary,
+          ResponseTexts,
+          SearchAmount,
+          CodeComments,
+          Badges,
           user_email,
         };
       }
diff --git a/utils/actions/markdownHelpers/helper.ts b/utils/actions/markdownHelpers/helper.ts
index 411c7117..2926a0b8 100644
--- a/utils/actions/markdownHelpers/helper.ts
+++ b/utils/actions/markdownHelpers/helper.ts
@@ -4,18 +4,24 @@ import getRelativeDate from "../../getRelativeDate";
 type generalMarkdown = MarkdownRequest & {
   systemName: string;
   systemResponseName: string;
+  ResponseTexts?: number;
 };
 const generalMarkdownHelper = ({
   value,
   userLogin,
+  ResponseTexts,
   systemName,
   systemResponseName,
 }: generalMarkdown): MarkdownResponse => {
   if (!value || value?.data?.length === 0) {
-    return `\n No results found in **${systemResponseName}** :( \n`;
+    return ResponseTexts
+      ? `\n No results found in **${systemResponseName}** :( \n`
+      : "";
   }
   if (value?.error?.match(/no (\w+) token/)) {
-    return `\n [Click here to login to ${systemName}](https://app.watermelontools.com)`;
+    return ResponseTexts
+      ? `\n [Click here to login to ${systemName}](https://app.watermelontools.com)`
+      : "";
   }
   let markdown: MarkdownResponse = ``;
   if (Array.isArray(value.data) && value?.data?.length) {
@@ -28,7 +34,7 @@ const generalMarkdownHelper = ({
           } ${created_at ? `${getRelativeDate(created_at ?? "")}` : ""}\n`
       )
       .join("");
-  } 
+  }
   return markdown;
 };
 
diff --git a/utils/db/user/patchUserSettings.ts b/utils/db/user/patchUserSettings.ts
index 61807361..3c3a25cf 100644
--- a/utils/db/user/patchUserSettings.ts
+++ b/utils/db/user/patchUserSettings.ts
@@ -6,8 +6,10 @@ export default async function updateUserSettings({
 }): Promise<any> {
   try {
     let data = await executeRequest(
-      `EXEC dbo.update_userSettings @watermelon_user = '${email}', @AISummary='${userSettings.AISummary}', @JiraTickets='${userSettings.JiraTickets}', @SlackMessages='${userSettings.SlackMessages}', @GitHubPRs='${userSettings.GitHubPRs}', @NotionPages= '${userSettings.NotionPages}', @LinearTickets= '${userSettings.LinearTickets}', @ConfluenceDocs= '${userSettings.ConfluenceDocs}'`
+      `EXEC dbo.update_userSettings @watermelon_user = '${email}', @AISummary='${userSettings.AISummary}', 
+      @ResponseTexts='${userSettings.ResponseTexts}', @Badges='${userSettings.Badges}', @CodeComments='${userSettings.CodeComments}', @SearchAmount=${userSettings.SearchAmount}`
     );
+
     return data;
   } catch (err) {
     console.error(err);