diff --git a/app/interactives/retirement-calculator/page.tsx b/app/interactives/retirement-calculator/page.tsx
index d66697b..f1b876b 100644
--- a/app/interactives/retirement-calculator/page.tsx
+++ b/app/interactives/retirement-calculator/page.tsx
@@ -37,16 +37,25 @@ const defaultInputs: CalculatorInputs = {
   yearsToRetirement: 0,
 }
 
+const baseInputClass = "w-full py-3 border-2 rounded-lg outline-none transition [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+const inputStateClass = (error?: string, warning?: string) =>
+  error
+    ? "border-[var(--color-inline-error)] focus:border-[var(--color-inline-error)] focus:ring-2 focus:ring-[var(--color-inline-error)]/20"
+    : warning
+    ? "border-[var(--color-inline-warning)] focus:border-[var(--color-inline-warning)] focus:ring-2 focus:ring-[var(--color-inline-warning)]/20"
+    : "border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-200"
+
 export default function RetirementCalculator() {
   const [activeTab, setActiveTab] = useState<"balance" | "savings">("balance")
   const [inputs, setInputs] = useState<CalculatorInputs>(defaultInputs)
   const [frozenRequiredBalance, setFrozenRequiredBalance] = useState<number>(0)
+  const [errors, setErrors] = useState<Partial<Record<keyof CalculatorInputs, string>>>({})
+  const [warnings, setWarnings] = useState<Partial<Record<keyof CalculatorInputs, string>>>({})
+  const [touched, setTouched] = useState<Partial<Record<keyof CalculatorInputs, boolean>>>({})
 
-  // Fix 1: Derive requiredBalance directly for balance tab display,
-  // separate from the frozen value used in savings tab
   const calculatedRequiredBalance = useMemo(() => {
     const rate = inputs.expectedReturnDuringRetirement / 100
-    if (rate <= 0) {
+    if (rate === 0) {
       return inputs.annualSpending * inputs.retirementLength
     }
     return (
@@ -55,22 +64,31 @@ export default function RetirementCalculator() {
     )
   }, [inputs.annualSpending, inputs.retirementLength, inputs.expectedReturnDuringRetirement])
 
-  // Show balance results only when all three balance inputs are filled
   const showBalanceResults =
     inputs.annualSpending > 0 &&
-    inputs.retirementLength > 0
+    inputs.retirementLength > 0 &&
+    !errors.annualSpending &&
+    !errors.retirementLength &&
+    !errors.expectedReturnDuringRetirement
+
+  const showSavingsResults =
+    frozenRequiredBalance > 0 &&
+    inputs.yearsToRetirement > 0 &&
+    inputs.expectedReturnBeforeRetirement !== 0 &&
+    !errors.currentSavings &&
+    !errors.yearsToRetirement &&
+    !errors.expectedReturnBeforeRetirement
 
   const results = useMemo(() => {
     const realReturnBeforeRetirement = inputs.expectedReturnBeforeRetirement / 100
 
-    // Fix 2: Use frozen value for savings tab, fresh calculation for balance tab
     const requiredBalance = activeTab === "savings" ? frozenRequiredBalance : calculatedRequiredBalance
 
     const FV_currentSavings = inputs.currentSavings * Math.pow(1 + realReturnBeforeRetirement, inputs.yearsToRetirement)
     const targetBalance = Math.max(0, requiredBalance - FV_currentSavings)
 
     let annualSavings: number
-    if (realReturnBeforeRetirement <= 0 || inputs.yearsToRetirement <= 0) {
+    if (realReturnBeforeRetirement === 0 || inputs.yearsToRetirement <= 0) {
       annualSavings = inputs.yearsToRetirement > 0 ? targetBalance / inputs.yearsToRetirement : 0
     } else {
       annualSavings =
@@ -79,7 +97,7 @@ export default function RetirementCalculator() {
     }
 
     const calculateFrequencySavings = (frequency: number) => {
-      if (realReturnBeforeRetirement <= 0 || inputs.yearsToRetirement <= 0) {
+      if (realReturnBeforeRetirement === 0 || inputs.yearsToRetirement <= 0) {
         return inputs.yearsToRetirement > 0 ? targetBalance / (inputs.yearsToRetirement * frequency) : 0
       }
       const periodRate = Math.pow(1 + realReturnBeforeRetirement, 1 / frequency) - 1
@@ -104,6 +122,72 @@ export default function RetirementCalculator() {
 
   const updateInput = (key: keyof CalculatorInputs, value: string) => {
     const numValue = parseFloat(value) || 0
+
+    if (key === "annualSpending") {
+      if (numValue !== 0 && (numValue < 1 || numValue > 10_000_000)) {
+        setErrors((prev) => ({ ...prev, annualSpending: "Enter an amount between $1 and $10,000,000." }))
+      } else {
+        setErrors((prev) => ({ ...prev, annualSpending: undefined }))
+      }
+    }
+
+    if (key === "currentSavings") {
+      if (numValue < 0 || numValue > 100_000_000) {
+        setErrors((prev) => ({ ...prev, currentSavings: "Enter an amount between $0 and $100,000,000." }))
+      } else {
+        setErrors((prev) => ({ ...prev, currentSavings: undefined }))
+      }
+    }
+
+    if (key === "expectedReturnBeforeRetirement") {
+      if (numValue < -5 || numValue > 30) {
+        setErrors((prev) => ({ ...prev, expectedReturnBeforeRetirement: "Enter a rate between −5% and 30%." }))
+        setWarnings((prev) => ({ ...prev, expectedReturnBeforeRetirement: undefined }))
+      } else if (numValue >= -5 && numValue < 0) {
+        setErrors((prev) => ({ ...prev, expectedReturnBeforeRetirement: undefined }))
+        setWarnings((prev) => ({ ...prev, expectedReturnBeforeRetirement: "A negative return means your savings are expected to lose value over time. Double-check your entry." }))
+      } else {
+        setErrors((prev) => ({ ...prev, expectedReturnBeforeRetirement: undefined }))
+        setWarnings((prev) => ({ ...prev, expectedReturnBeforeRetirement: undefined }))
+      }
+    }
+
+    if (key === "yearsToRetirement") {
+      if (numValue < 0 || numValue > 75) {
+        setErrors((prev) => ({ ...prev, yearsToRetirement: "Enter an amount of years between 0 and 75." }))
+      } else if (numValue === 0 && value !== "") {
+        setErrors((prev) => ({ ...prev, yearsToRetirement: "With no time left to save, you'd need your full target balance today." }))
+      } else if (numValue > 0) {
+        setErrors((prev) => ({ ...prev, yearsToRetirement: undefined }))
+      }
+    }
+
+    if (key === "expectedReturnDuringRetirement") {
+      if (numValue !== 0 && (numValue < -5 || numValue > 30)) {
+        setErrors((prev) => ({ ...prev, expectedReturnDuringRetirement: "Enter a rate between −5% and 30%." }))
+      } else {
+        setErrors((prev) => ({ ...prev, expectedReturnDuringRetirement: undefined }))
+      }
+      if (numValue >= -5 && numValue < 0) {
+        setWarnings((prev) => ({ ...prev, expectedReturnDuringRetirement: "A negative return means your savings are expected to lose value over time. Double-check your entry." }))
+      } else {
+        setWarnings((prev) => ({ ...prev, expectedReturnDuringRetirement: undefined }))
+      }
+    }
+
+    if (key === "retirementLength") {
+      if (numValue !== 0 && (numValue < 1 || numValue > 75)) {
+        setErrors((prev) => ({ ...prev, retirementLength: "Enter an amount of years between 1 and 75." }))
+      } else {
+        setErrors((prev) => ({ ...prev, retirementLength: undefined }))
+      }
+      if (numValue >= 1 && numValue <= 3) {
+        setWarnings((prev) => ({ ...prev, retirementLength: "This is a very short retirement. Double-check your entry." }))
+      } else {
+        setWarnings((prev) => ({ ...prev, retirementLength: undefined }))
+      }
+    }
+
     setInputs((prev) => ({ ...prev, [key]: numValue }))
 
     const balanceInputs: Array<keyof CalculatorInputs> = [
@@ -113,13 +197,12 @@ export default function RetirementCalculator() {
     ]
 
     if (balanceInputs.includes(key)) {
-      // Fix 3: Correct stale closure — always use the right new vs old values
       const spendingVal = key === "annualSpending" ? numValue : inputs.annualSpending
       const lengthVal = key === "retirementLength" ? numValue : inputs.retirementLength
       const rateVal = key === "expectedReturnDuringRetirement" ? numValue / 100 : inputs.expectedReturnDuringRetirement / 100
 
       let calculatedFrozen: number
-      if (rateVal <= 0) {
+      if (rateVal === 0) {
         calculatedFrozen = spendingVal * lengthVal
       } else {
         calculatedFrozen =
@@ -133,6 +216,9 @@ export default function RetirementCalculator() {
 
   const handleReset = () => {
     setInputs(defaultInputs)
+    setErrors({})
+    setWarnings({})
+    setTouched({})
     setActiveTab("balance")
     setFrozenRequiredBalance(0)
   }
@@ -141,7 +227,6 @@ export default function RetirementCalculator() {
     <div className="p-6 max-w-5xl mx-auto">
       <div className="mb-8">
         <ThemeToggle />
-        {/* Fix 6: proper h1 */}
         <h1 className="sr-only">Retirement Planning Calculator</h1>
 
         <Tabs
@@ -178,7 +263,6 @@ export default function RetirementCalculator() {
                 {/* Annual Spending */}
                 <div className="space-y-2">
                   <div className="flex items-center gap-2">
-                    {/* Fix 1a: htmlFor linked to input id */}
                     <label htmlFor="annual-spending" className="block text-sm text-foreground">
                       Annual spending in retirement
                     </label>
@@ -191,19 +275,26 @@ export default function RetirementCalculator() {
                     </InfoPopover>
                   </div>
                   <div className="relative">
-                    {/* Fix 2: aria-hidden on decorative symbol */}
                     <span aria-hidden="true" className="absolute text-[var(--color-symbols)] left-3 top-1/2 -translate-y-1/2 font-medium">$</span>
                     <input
                       id="annual-spending"
                       type="text"
                       inputMode="numeric"
                       min="1"
+                      aria-describedby={errors.annualSpending ? "annual-spending-error" : undefined}
+                      aria-invalid={!!errors.annualSpending}
                       value={inputs.annualSpending ? formatNumberWithCommas(inputs.annualSpending.toString()) : ""}
                       onChange={(e) => updateInput("annualSpending", e.target.value.replace(/,/g, ""))}
-                      className="w-full pl-8 pr-16 py-3 border-2 border-gray-300 rounded-lg focus:border-blue-500 focus:ring-2 focus:ring-blue-200 outline-none transition [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                      className={`${baseInputClass} pl-8 pr-16 ${inputStateClass(errors.annualSpending)}`}
                     />
                   </div>
-                  <p className="text-xs">How much you plan to withdraw each year.</p>
+                  {errors.annualSpending ? (
+                    <p id="annual-spending-error" role="alert" className="text-sm text-[var(--color-inline-error)]">
+                      {errors.annualSpending}
+                    </p>
+                  ) : (
+                    <p className="text-xs">How much you plan to withdraw each year.</p>
+                  )}
                 </div>
 
                 {/* Retirement Length */}
@@ -216,16 +307,34 @@ export default function RetirementCalculator() {
                       id="retirement-length"
                       type="number"
                       min="1"
+                      max="75"
+                      aria-describedby={
+                        errors.retirementLength
+                          ? "retirement-length-error"
+                          : warnings.retirementLength
+                          ? "retirement-length-warning"
+                          : undefined
+                      }
+                      aria-invalid={!!errors.retirementLength}
                       value={inputs.retirementLength || ""}
                       onChange={(e) => updateInput("retirementLength", e.target.value)}
-                      className="w-full pl-4 pr-16 py-3 border-2 border-gray-300 rounded-lg focus:border-blue-500 focus:ring-2 focus:ring-blue-200 outline-none transition [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                      className={`${baseInputClass} pl-4 pr-16 ${inputStateClass(errors.retirementLength, warnings.retirementLength)}`}
                     />
-                    {/* Fix 3: aria-hidden on decorative suffix */}
                     <span aria-hidden="true" className="absolute right-4 top-1/2 -translate-y-1/2 text-[var(--color-symbols)] pointer-events-none">
                       years
                     </span>
                   </div>
-                  <p className="text-xs">How many years your retirement will last.</p>
+                  {errors.retirementLength ? (
+                    <p id="retirement-length-error" role="alert" className="text-sm text-[var(--color-inline-error)]">
+                      {errors.retirementLength}
+                    </p>
+                  ) : warnings.retirementLength ? (
+                    <p id="retirement-length-warning" role="status" className="text-sm text-[var(--color-inline-warning)]">
+                      {warnings.retirementLength}
+                    </p>
+                  ) : (
+                    <p className="text-xs">How many years your retirement will last.</p>
+                  )}
                 </div>
 
                 {/* Expected Return During Retirement */}
@@ -245,15 +354,34 @@ export default function RetirementCalculator() {
                     <input
                       id="return-during-retirement"
                       type="number"
-                      min="0"
+                      min="-5"
+                      max="30"
                       step="0.1"
+                      aria-describedby={
+                        errors.expectedReturnDuringRetirement
+                          ? "return-during-retirement-error"
+                          : warnings.expectedReturnDuringRetirement
+                          ? "return-during-retirement-warning"
+                          : undefined
+                      }
+                      aria-invalid={!!errors.expectedReturnDuringRetirement}
                       value={inputs.expectedReturnDuringRetirement || ""}
                       onChange={(e) => updateInput("expectedReturnDuringRetirement", e.target.value)}
-                      className="w-full pl-4 pr-16 py-3 border-2 border-gray-300 rounded-lg focus:border-blue-500 focus:ring-2 focus:ring-blue-200 outline-none transition [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                      className={`${baseInputClass} pl-4 pr-16 ${inputStateClass(errors.expectedReturnDuringRetirement, warnings.expectedReturnDuringRetirement)}`}
                     />
                     <span aria-hidden="true" className="absolute right-4 top-1/2 -translate-y-1/2 text-[var(--color-symbols)] pointer-events-none">%</span>
                   </div>
-                  <p className="text-xs">Annual investment return rate during retirement.</p>
+                  {errors.expectedReturnDuringRetirement ? (
+                    <p id="return-during-retirement-error" role="alert" className="text-sm text-[var(--color-inline-error)]">
+                      {errors.expectedReturnDuringRetirement}
+                    </p>
+                  ) : warnings.expectedReturnDuringRetirement ? (
+                    <p id="return-during-retirement-warning" role="status" className="text-sm text-[var(--color-inline-warning)]">
+                      {warnings.expectedReturnDuringRetirement}
+                    </p>
+                  ) : (
+                    <p className="text-xs">Annual investment return rate during retirement.</p>
+                  )}
                 </div>
               </>
             ) : (
@@ -285,12 +413,20 @@ export default function RetirementCalculator() {
                       inputMode="numeric"
                       min="0"
                       placeholder=""
+                      aria-describedby={errors.currentSavings ? "current-savings-error" : undefined}
+                      aria-invalid={!!errors.currentSavings}
                       value={inputs.currentSavings ? formatNumberWithCommas(inputs.currentSavings.toString()) : ""}
                       onChange={(e) => updateInput("currentSavings", e.target.value.replace(/,/g, ""))}
-                      className="w-full pl-8 pr-16 py-3 border-2 border-gray-300 rounded-lg focus:border-blue-500 focus:ring-2 focus:ring-blue-200 outline-none transition [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                      className={`${baseInputClass} pl-8 pr-16 ${inputStateClass(errors.currentSavings)}`}
                     />
                   </div>
-                  <p className="text-xs">How much you have already saved for retirement.</p>
+                  {errors.currentSavings ? (
+                    <p id="current-savings-error" role="alert" className="text-sm text-[var(--color-inline-error)]">
+                      {errors.currentSavings}
+                    </p>
+                  ) : (
+                    <p className="text-xs">How much you have already saved for retirement.</p>
+                  )}
                 </div>
 
                 {/* Years to Retirement */}
@@ -303,16 +439,35 @@ export default function RetirementCalculator() {
                       id="years-to-retirement"
                       type="number"
                       min="0"
-                      max="99"
+                      max="75"
+                      aria-describedby={touched.yearsToRetirement && errors.yearsToRetirement ? "years-to-retirement-error" : undefined}
+                      aria-invalid={touched.yearsToRetirement && !!errors.yearsToRetirement}
                       value={inputs.yearsToRetirement || ""}
-                      onChange={(e) => updateInput("yearsToRetirement", e.target.value)}
-                      className="w-full pl-4 pr-16 py-3 border-2 border-gray-300 rounded-lg focus:border-blue-500 focus:ring-2 focus:ring-blue-200 outline-none transition [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                      onChange={(e) => {
+                        setTouched((prev) => ({ ...prev, yearsToRetirement: true }))
+                        updateInput("yearsToRetirement", e.target.value)
+                      }}
+                      onBlur={(e) => {
+                        setTouched((prev) => ({ ...prev, yearsToRetirement: true }))
+                        if (e.target.value === "") {
+                          setErrors((prev) => ({ ...prev, yearsToRetirement: "Please enter how many years until you plan to retire." }))
+                        } else if (inputs.yearsToRetirement === 0) {
+                          setErrors((prev) => ({ ...prev, yearsToRetirement: "With no time left to save, you'd need your full target balance today." }))
+                        }
+                      }}
+                      className={`${baseInputClass} pl-4 pr-16 ${touched.yearsToRetirement ? inputStateClass(errors.yearsToRetirement) : "border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-200"}`}
                     />
                     <span aria-hidden="true" className="absolute right-4 top-1/2 -translate-y-1/2 text-[var(--color-symbols)] pointer-events-none">
                       years
                     </span>
                   </div>
-                  <p className="text-xs">How many years until you plan to retire.</p>
+                  {touched.yearsToRetirement && errors.yearsToRetirement ? (
+                    <p id="years-to-retirement-error" role="alert" className="text-sm text-[var(--color-inline-error)]">
+                      {errors.yearsToRetirement}
+                    </p>
+                  ) : (
+                    <p className="text-xs">How many years until you plan to retire.</p>
+                  )}
                 </div>
 
                 {/* Expected Return Before Retirement */}
@@ -332,20 +487,48 @@ export default function RetirementCalculator() {
                     <input
                       id="return-before-retirement"
                       type="number"
-                      min="0"
+                      min="-5"
+                      max="30"
                       step="0.1"
+                      aria-describedby={
+                        touched.expectedReturnBeforeRetirement && errors.expectedReturnBeforeRetirement
+                          ? "return-before-retirement-error"
+                          : warnings.expectedReturnBeforeRetirement
+                          ? "return-before-retirement-warning"
+                          : undefined
+                      }
+                      aria-invalid={touched.expectedReturnBeforeRetirement && !!errors.expectedReturnBeforeRetirement}
                       value={inputs.expectedReturnBeforeRetirement || ""}
-                      onChange={(e) => updateInput("expectedReturnBeforeRetirement", e.target.value)}
-                      className="w-full pl-4 pr-16 py-3 border-2 border-gray-300 rounded-lg focus:border-blue-500 focus:ring-2 focus:ring-blue-200 outline-none transition [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+                      onChange={(e) => {
+                        setTouched((prev) => ({ ...prev, expectedReturnBeforeRetirement: true }))
+                        updateInput("expectedReturnBeforeRetirement", e.target.value)
+                      }}
+                      onBlur={(e) => {
+                        setTouched((prev) => ({ ...prev, expectedReturnBeforeRetirement: true }))
+                        if (e.target.value === "") {
+                          setErrors((prev) => ({ ...prev, expectedReturnBeforeRetirement: "Please enter an expected annual return rate before retirement." }))
+                        }
+                      }}
+                      className={`${baseInputClass} pl-4 pr-16 ${touched.expectedReturnBeforeRetirement ? inputStateClass(errors.expectedReturnBeforeRetirement, warnings.expectedReturnBeforeRetirement) : warnings.expectedReturnBeforeRetirement ? inputStateClass(undefined, warnings.expectedReturnBeforeRetirement) : "border-gray-300 focus:border-blue-500 focus:ring-2 focus:ring-blue-200"}`}
                     />
                     <span aria-hidden="true" className="absolute right-4 top-1/2 -translate-y-1/2 text-[var(--color-symbols)] pointer-events-none">%</span>
                   </div>
-                  <p className="text-xs">Annual investment return rate before retirement.</p>
+                  {touched.expectedReturnBeforeRetirement && errors.expectedReturnBeforeRetirement ? (
+                    <p id="return-before-retirement-error" role="alert" className="text-sm text-[var(--color-inline-error)]">
+                      {errors.expectedReturnBeforeRetirement}
+                    </p>
+                  ) : warnings.expectedReturnBeforeRetirement ? (
+                    <p id="return-before-retirement-warning" role="status" className="text-sm text-[var(--color-inline-warning)]">
+                      {warnings.expectedReturnBeforeRetirement}
+                    </p>
+                  ) : (
+                    <p className="text-xs">Annual investment return rate before retirement.</p>
+                  )}
                 </div>
               </>
             )}
 
-            {/* Reset Button — Fix 4: type="button" */}
+            {/* Reset Button */}
             <div className="flex gap-3 pt-4">
               <button
                 type="button"
@@ -365,10 +548,8 @@ export default function RetirementCalculator() {
           >
             {activeTab === "balance" ? (
               <>
-                {/* Fix 6: h2 for result heading */}
                 <h2 className="mb-1 text-xl font-bold">Required Retirement Balance</h2>
 
-                {/* Fix 2: Balance tab no longer checks fvCurrentSavings — that's a savings tab concern */}
                 {showBalanceResults ? (
                   <>
                     <p className="text-4xl font-bold text-[var(--color-teal)]">
@@ -382,7 +563,6 @@ export default function RetirementCalculator() {
                       retirement.
                     </p>
                     <div className="flex gap-3">
-                      {/* Fix 5: type="button" */}
                       <button
                         type="button"
                         onClick={() => {
@@ -408,36 +588,42 @@ export default function RetirementCalculator() {
             ) : (
               <>
                 <h2 className="font-bold text-xl mb-1">Required Retirement Balance</h2>
-                <p className="text-4xl font-bold text-[var(--color-teal)]">
-                  {frozenRequiredBalance > 0 ? formatCurrency(results.requiredBalance) : "—"}
-                </p>
-                <p className="mt-3 mb-6 text-sm">
-                  This estimates the lump sum needed at retirement to fund{" "}
-                  {formatCurrency(inputs.annualSpending)} per year for{" "}
-                  {inputs.retirementLength} years, assuming a{" "}
-                  {inputs.expectedReturnDuringRetirement}% annual return during
-                  retirement.
-                </p>
-
-                {frozenRequiredBalance > 0 && results.fvCurrentSavings >= results.requiredBalance ? (
+
+                {frozenRequiredBalance > 0 ? (
+                  <>
+                    <p className="text-4xl font-bold text-[var(--color-teal)]">
+                      {formatCurrency(results.requiredBalance)}
+                    </p>
+                    <p className="mt-3 mb-6 text-sm">
+                      This estimates the lump sum needed at retirement to fund{" "}
+                      {formatCurrency(inputs.annualSpending)} per year for{" "}
+                      {inputs.retirementLength} years, assuming a{" "}
+                      {inputs.expectedReturnDuringRetirement}% annual return during
+                      retirement.
+                    </p>
+                  </>
+                ) : (
+                  <div className="border-2 px-4 py-3 rounded-xl">
+                    <p className="text-sm">
+                      The required retirement balance will appear here. Complete
+                      Step 1 on the Required balance tab first.
+                    </p>
+                  </div>
+                )}
+
+                {showSavingsResults && results.fvCurrentSavings >= results.requiredBalance ? (
                   <div className="border-2 px-4 py-3 rounded-xl">
-                    <h3 className="text-xl font-bold mb-4">Good news!</h3>
                     <p className="mt-3 mb-6 text-sm">
                       With an expected {inputs.expectedReturnBeforeRetirement}% annual
-                      return, the current retirement savings of{" "}
+                      return, your current savings of{" "}
                       {formatCurrency(inputs.currentSavings)} are projected to{" "}
                       {results.fvCurrentSavings > results.requiredBalance ? "exceed" : "reach"}{" "}
-                      the target retirement balance with no additional contributions.
-                      {results.fvCurrentSavings > results.requiredBalance && (
-                        <>
-                          <br />
-                          Estimated balance at retirement:{" "}
-                          {formatCurrency(results.fvCurrentSavings)}
-                        </>
-                      )}
+                      your target retirement balance with no additional contributions.
+                      Estimated balance at retirement:{" "}
+                      {formatCurrency(results.fvCurrentSavings)}.
                     </p>
                   </div>
-                ) : frozenRequiredBalance > 0 ? (
+                ) : showSavingsResults ? (
                   <>
                     <h3 className="mb-1 font-bold text-lg">Required Annual Savings</h3>
                     <p className="text-4xl font-bold text-[var(--color-teal)]">
@@ -474,6 +660,11 @@ export default function RetirementCalculator() {
                       </div>
                     </div>
                   </>
+                ) : frozenRequiredBalance > 0 ? (
+                  <>
+                    <h3 className="mb-1 font-bold text-lg">Required Annual Savings</h3>
+                    <p className="text-4xl font-bold text-[var(--color-teal)]">—</p>
+                  </>
                 ) : null}
               </>
             )}
diff --git a/app/ui/globals.css b/app/ui/globals.css
index 061b3ac..d5bc9bd 100644
--- a/app/ui/globals.css
+++ b/app/ui/globals.css
@@ -123,6 +123,7 @@
   --color-teal: rgba(0, 124, 146, 1);
   --color-symbols: #616877;
   --color-inline-error: #8C1515;
+  --color-inline-warning: #C74632;
   --results-card-empty: rgba(102, 112, 133, 1);
   --info-popup-background: rgba(239, 255, 252, 1);
 }
@@ -181,6 +182,7 @@
   --color-teal: rgba(74, 203, 225, 1);
   --color-symbols: oklch(0.985 0 0);
   --color-inline-error: #F4795B;
+  --color-inline-warning: #E98300;
   --results-card-empty: oklch(0.985 0 0);
   --info-popup-background: rgba(35, 35, 35, 1);
 }