Squashed commit of the following:

commit b494ab9
Author: Jane Kamata <38163243+janekamata@users.noreply.github.com>
Date:   Tue Apr 14 19:50:34 2026 -0400

    Styling fixes (#425)

commit bd40505
Merge: 928ad1f e08b3fd
Author: prooflesben <122566738+prooflesben@users.noreply.github.com>
Date:   Tue Apr 14 18:46:04 2026 -0400

    Merge pull request #414 from Code-4-Community/backgroundFix

    background fix

commit e08b3fd
Merge: 6ca3482 10fb2cd
Author: Jane Kamata <38163243+janekamata@users.noreply.github.com>
Date:   Mon Apr 13 13:24:48 2026 -0400

    Merge branch 'main' into backgroundFix

commit 6ca3482
Author: adityapat24 <appathak46@gmail.com>
Date:   Sun Apr 12 17:22:07 2026 -0400

    removed media query

commit 36c4cb3
Author: adityapat24 <appathak46@gmail.com>
Date:   Sun Apr 12 13:59:18 2026 -0400

    background fix

Author: janekamata

frontend/src/components/ActionConfirmation.tsx

@@ -68,7 +68,7 @@ import { IoIosWarning } from "react-icons/io";
             <Button text="Yes, confirm" onClick={() => {
                 onConfirmDelete();
                 onCloseDelete();
-              }} className="border-grey-500 hover:text-primary-900" />
+              }} className="border-grey-500" />
           </div>
 
           </div>

frontend/src/components/Button.tsx

@@ -51,7 +51,7 @@ export default function Button({
       )}
       {logo && logoPosition === "center" && (
         <span className="flex items-center justify-center">
-          <FontAwesomeIcon icon={logo} className="w-3 h-3 lg:w-4 lg:h-4" />
+          <FontAwesomeIcon icon={logo} className="w-6 h-6" />
         </span>
       )}
     </button>

frontend/src/main-page/cash-flow/components/CashAddRevenue.tsx

@@ -298,7 +298,7 @@ export default function CashAddRevenue() {
         text="Add Revenue Source"
         onClick={handleSubmit}
         disabled={isSubmitting}
-        className="bg-green hover:!border-green text-white mt-2 text-sm lg:text-base"
+        className="bg-green hover:!border-green text-white mt-2 text-sm lg:text-base active:!bg-green active:!border-green w-full"
       />
     </div>
   );

frontend/src/main-page/cash-flow/components/CashEditLineItem.tsx

@@ -59,7 +59,7 @@ export default function CashEditLineItem({
               logo={faTrash}
               logoPosition="right"
               onClick={() => setShowDeleteModal(true)}
-              className="bg-red-light text-red hover:!border-red text-sm lg:text-base"
+              className="bg-red-light text-red hover:!border-red text-sm lg:text-base active:!bg-red active:!border-red"
             />
               </>
             )}

frontend/src/main-page/cash-flow/components/CashRevenueInstallment.tsx

@@ -77,7 +77,7 @@ export default function CashRevenueInstallment({
             onClick={() => onDelete?.()}
             logo={faTrash}
             logoPosition="center"
-            className="bg-red-light text-red w-10 h-10 p-0 rounded-full mb-1.5 shrink-0 border-0"
+            className="bg-red-light text-red w-10 h-10 p-0 rounded-full mb-1.5 shrink-0 border-0 active:!bg-red active:!border-red hover:!border-red"
           />
         ) : (
           <div className="hidden xl:block w-8 h-8 shrink-0" />

frontend/src/main-page/grants/GrantPage.tsx

@@ -38,6 +38,13 @@ function GrantPage() {
   grants[0] ??
   null;
 
+  const mainContainer = document.getElementsByClassName('grant-container');
+
+  useEffect(() => {
+    clearAllFilters();
+    mainContainer[0].scrollTo(0, 0);
+  }, [curGrant]);
+
   const handleGrantCreated = (grantId: number) => {
     setCurId(grantId);
 
@@ -132,7 +139,7 @@ function GrantPage() {
             />
           ))}
         </div>
-        <div className="flex-1 overflow-y-auto rounded-md">
+        <div className="grant-container flex-1 overflow-y-auto rounded-md">
           <GrantItem grant={curGrant} />
         </div>
       </div>) : (<div className="flex w-full h-full justify-center mt-24 text-gray-500 text-2xl">

frontend/src/main-page/grants/edit-grant/EditGrant.tsx

@@ -211,7 +211,7 @@ const EditGrant: React.FC<{
           {/* Divider */}
           {grantToEdit && (<div>
           <hr className="border-grey-400 border-t-2 rounded-full" />
-          <Button text="Delete Grant" logo={faTrash} logoPosition="right" className="w-fit mt-6 ml-auto text-red hover:border-red bg-red-light" onClick={() => setShowDeleteModal(true)}/>
+          <Button text="Delete Grant" logo={faTrash} logoPosition="right" className="w-fit mt-6 ml-auto text-red active:!bg-red active:!border-red hover:border-red bg-red-light" onClick={() => setShowDeleteModal(true)}/>
           <ActionConfirmation
                       isOpen={showDeleteModal}
                       onCloseDelete={() => setShowDeleteModal(false)}

frontend/src/main-page/grants/edit-grant/components/EditGrantInfo.tsx

@@ -67,7 +67,7 @@ export default function EditGrantInfo({ form, dispatch }: EditGrantProps) {
                 logo={faCheckSquare}
                 logoPosition="left"
                 text="Yes"
-                className={`text-gray-700 px-2 py-1 w-20 text-sm border-2  hover:!border-green active:bg-green ${form.doesBcanQualify === "yes" ? "text-green border-green" : "border-grey-300 text-grey-700"}`}
+                className={`text-gray-700 px-2 py-1 w-20 text-sm border-2  hover:!border-green active:!bg-green ${form.doesBcanQualify === "yes" ? "text-green border-green" : "border-grey-300 text-grey-700"}`}
                 onClick={() =>
                   dispatch({
                     type: "SET_FIELD",

frontend/src/main-page/grants/grant-view/GrantView.tsx

@@ -205,7 +205,7 @@ const GrantItem: React.FC<GrantItemProps> = observer(({ grant }) => {
               {
                 label: "Contacts",
                 item: (
-                  <div className="grid grid-cols-1 2xl:grid-cols-2 w-full h-full lg:w-[85%] gap-6">
+                  <div className="grid grid-cols-1 2xl:grid-cols-2 w-full h-full lg:w-[90%] gap-6">
                     <ContactCard contact={grant.bcan_poc} type="BCAN" />
                     <ContactCard
                       contact={grant.grantmaker_poc}

frontend/src/main-page/settings/ChangePasswordModal.tsx

@@ -6,6 +6,7 @@ import {
   PasswordRequirements,
   isPasswordValid,
 } from "../../sign-up";
+import Button from "../../components/Button";
 
 export type ChangePasswordFormValues = {
   currentPassword: string;
@@ -119,15 +120,7 @@ export default function ChangePasswordModal({
               {error ?? "Your passwords do not match."}
             </div>
           )}
-
-          <button
-            type="button"
-            onClick={handleSave}
-            disabled={!canSave}
-            className="w-full rounded-md py-2.5 text-base font-semibold text-white transition disabled:cursor-not-allowed disabled:opacity-50 bg-primary-900 enabled:hover:opacity-90"
-          >
-            Save
-          </button>
+          <Button text="Save" onClick={handleSave} disabled={!canSave} className="bg-primary-900 text-white w-full" />
         </div>
       </div>
     </div>