diff --git a/components/src/components/elements/plan-manager/PlanManager.tsx b/components/src/components/elements/plan-manager/PlanManager.tsx
index a0d6ffe3..cf11c428 100644
--- a/components/src/components/elements/plan-manager/PlanManager.tsx
+++ b/components/src/components/elements/plan-manager/PlanManager.tsx
@@ -100,6 +100,7 @@ export const PlanManager = forwardRef<
           <Flex
             $justifyContent="space-between"
             $alignItems="center"
+            $gap="1rem"
             $width="100%"
             {...(canChangePlan && { $margin: "0 0 1.5rem" })}
           >
diff --git a/components/src/components/elements/upcoming-bill/UpcomingBill.tsx b/components/src/components/elements/upcoming-bill/UpcomingBill.tsx
index dee87a58..991bb683 100644
--- a/components/src/components/elements/upcoming-bill/UpcomingBill.tsx
+++ b/components/src/components/elements/upcoming-bill/UpcomingBill.tsx
@@ -121,8 +121,7 @@ export const UpcomingBill = forwardRef<
               }
               $color={theme.typography[props.contractEndDate.fontStyle].color}
             >
-              Estimated{" "}
-              {upcomingInvoice.interval === "year" ? "yearly" : "monthly"} bill.
+              Estimated bill.
             </Text>
           </Box>
         </Flex>
diff --git a/components/src/components/ui/modal/Modal.tsx b/components/src/components/ui/modal/Modal.tsx
index a5f882c8..73bed163 100644
--- a/components/src/components/ui/modal/Modal.tsx
+++ b/components/src/components/ui/modal/Modal.tsx
@@ -51,9 +51,12 @@ export const Modal = ({ children, size = "auto", onClose }: ModalProps) => {
       $width="100%"
       $height="100%"
       $backgroundColor={
-        isLightBackground ? "hsla(0, 0%, 85%, 0.8)" : "hsla(0, 0%, 15%, 0.8)"
+        isLightBackground ? "hsla(0, 0%, 85%, 0.8)" : "hsla(0, 0%, 0%, 0.8)"
       }
       $overflow="hidden"
+      $scrollbarColor={`${isLightBackground ? "hsla(0, 0%, 0%, 0.15)" : "hsla(0, 0%, 100%, 0.15)"} transparent`}
+      $scrollbarWidth="thin"
+      $scrollbarGutter="stable both-edges"
     >
       <Flex
         $position="relative"