owlplanner 2025.5.28__tar.gz → 2025.6.3__tar.gz

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/INSTALL.md

@@ -24,13 +24,15 @@ git clone https://github.com/mdlacasse/Owl.git
 
 ```
 Then go (`cd`) to the directory where you installed Owl.
-You can install the Owl package directly from the [Python Package Index](http://pypi.org).
 From the top directory of the source code run:
 The following command will install the current version of owlplanner and all its dependencies:
 ```shell
 pip install -r ui/requirements.txt
 ```
 
+You can also install the Owl package directly from the [Python Package Index](http://pypi.org).
+
+
 ### Running the streamlit frontend locally
 Running the Owl user interface locally from Windows:
 ```shell
@@ -64,7 +66,7 @@ Run checks before all commits:
 flake8 ui src tests
 pytest
 ```
-Edit version number in `src/owlplanner/version.py`, `ui/requirements.txt`, and in `pyproject.toml`. Then,
+Edit version number in `src/owlplanner/version.py` and in `pyproject.toml`. Then,
 ```shell
 rm dist/*
 python -m build

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: owlplanner
-Version: 2025.5.28
+Version: 2025.6.3
 Summary: Owl: Retirement planner with great wisdom
 Project-URL: HomePage, https://github.com/mdlacasse/owl
 Project-URL: Repository, https://github.com/mdlacasse/owl
@@ -748,13 +748,6 @@ This is exactly where this tool fits it. Given your savings capabilities and spe
 it can generate different future realizations of
 your strategy under different market assumptions, helping to better understand your financial situation.
 
-Disclaimers: I am not a financial planner. You make your own decisions.
-This program comes with no guarantee. Use at your own risk.
-
-More disclaimers: While some output of the code has been verified with other approaches,
-this code is still under development and I cannot guarantee the accuracy of the results.
-Use at your own risk.
-
 -------------------------------------------------------------------------------------
 ## Purpose and vision
 The goal of Owl is to create a free and open-source ecosystem that has cutting-edge optimization capabilities,
@@ -839,7 +832,7 @@ an Excel spreadsheet that contains future wages, contributions
 to savings accounts, and planned *big-ticket items* such as the purchase of a lake house,
 the sale of a boat, large gifts, or inheritance.
 
-Three types of savings accounts are considered: taxable, tax-deferred, and tax-exempt,
+Three types of savings accounts are considered: taxable, tax-deferred, and tax-free,
 which are all tracked separately for married individuals. Asset transition to the surviving spouse
 is done according to beneficiary fractions for each type of savings account.
 Tax status covers married filing jointly and single, depending on the number of individuals reported.
@@ -898,8 +891,10 @@ assets to support, even with no estate being left.
 
 Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimers: I am not a financial planner. You make your own decisions.
-This program comes with no guarantee. Use at your own risk.
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
+Code output has been verified with analytical solutions and other approaches.
+Nevertheless, accuracy of results are not guaranteed.
 
 --------------------------------------------------------
 

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/README.md

@@ -42,13 +42,6 @@ This is exactly where this tool fits it. Given your savings capabilities and spe
 it can generate different future realizations of
 your strategy under different market assumptions, helping to better understand your financial situation.
 
-Disclaimers: I am not a financial planner. You make your own decisions.
-This program comes with no guarantee. Use at your own risk.
-
-More disclaimers: While some output of the code has been verified with other approaches,
-this code is still under development and I cannot guarantee the accuracy of the results.
-Use at your own risk.
-
 -------------------------------------------------------------------------------------
 ## Purpose and vision
 The goal of Owl is to create a free and open-source ecosystem that has cutting-edge optimization capabilities,
@@ -133,7 +126,7 @@ an Excel spreadsheet that contains future wages, contributions
 to savings accounts, and planned *big-ticket items* such as the purchase of a lake house,
 the sale of a boat, large gifts, or inheritance.
 
-Three types of savings accounts are considered: taxable, tax-deferred, and tax-exempt,
+Three types of savings accounts are considered: taxable, tax-deferred, and tax-free,
 which are all tracked separately for married individuals. Asset transition to the surviving spouse
 is done according to beneficiary fractions for each type of savings account.
 Tax status covers married filing jointly and single, depending on the number of individuals reported.
@@ -192,8 +185,10 @@ assets to support, even with no estate being left.
 
 Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimers: I am not a financial planner. You make your own decisions.
-This program comes with no guarantee. Use at your own risk.
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
+Code output has been verified with analytical solutions and other approaches.
+Nevertheless, accuracy of results are not guaranteed.
 
 --------------------------------------------------------
 

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/USER_GUIDE.md

@@ -20,7 +20,7 @@ import owlplanner as owl
 # Jack was born in 1962 and expects to live to age 89. Jill was born in 1965 and hopes to live to age 92.
 # Plan starts on Jan 1st of this year.
 plan = owl.Plan(['Jack', 'Jill'], [1962, 1965], [89, 92], 'jack & jill - tutorial', startDate='01-01')
-# Jack has $90.5k in a taxable investment account, $600.5k in a tax-deferred account and $70k from 2 tax-exempt accounts.
+# Jack has $90.5k in a taxable investment account, $600.5k in a tax-deferred account and $70k from 2 tax-free accounts.
 # Jill has $60.2k in her taxable account, $150k in a 403b, and $40k in a Roth IRA.
 plan.setAccountBalances(taxable=[90.5, 60.2], taxDeferred=[600.5, 150], taxFree=[50.6 + 20, 40.8])
 # An Excel file contains 2 tabs (one for Jill, one for Jack) describing anticipated wages and contributions.

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/docs/owl.tex

@@ -81,7 +81,7 @@ index name as a subscript, e.g., $N_i$ for index $i$.
 		is denoted by $i_d$ while the survivor is $i_s$.
 \item [$j$]
 	Type of savings account. $j$ goes from 0 to $N_j - 1$, for taxable, tax-deferred,
-	and tax-exempt accounts respectively. Therefore $N_j = 3$.
+	and tax-free accounts respectively. Therefore $N_j = 3$.
 \item[$k$]
 	Type of asset class. $k$ goes from 0 to $N_k -1 $, for S\&P 500,
 	Baa corporate bonds, Treasury notes, and cash, respectively. $N_k = 4$.
@@ -583,7 +583,7 @@ add the market returns to the savings balances.
 	Changes include contributions $\kappa$, distributions and withdrawals $w$,
 	conversions $x$, surplus deposits $d$, and growth $\tau$ on the account through the year.
 	For each spouse $i$, we track each savings account $j$ separately, and tax-deferred accounts
-	are coupled to the corresponding tax-exempt account through Roth conversions.
+	are coupled to the corresponding tax-free account through Roth conversions.
 
 	The timing of Roth conversions, withdrawals, and deposits brings
 	additional coupling between these variables, and is worth a detailed discussion.
@@ -605,7 +605,7 @@ add the market returns to the savings balances.
 	a direct withdrawal from the tax-deferred account at mid-year will always
 	be unfavorable when compared to a Roth conversion
 	at the beginning of the year, followed
-	by a tax-exempt withdrawal later in the same year.
+	by a tax-free withdrawal later in the same year.
 	This is because the second
 	scenario involves gains which are tax-free over the half-year, while
 	the first one does not. Moving account withdrawals at the beginning
@@ -620,7 +620,7 @@ add the market returns to the savings balances.
 	\end{eqnarray*}
 	for $j \neq 1$, i.e., for all withdrawals except those from tax-deferred accounts.
 	For example, to favor tax-deferred withdrawals in most reasonable situations,
-	it is desirable to make Roth conversions and tax-exempt distributions exclusive events
+	it is desirable to make Roth conversions and tax-free distributions exclusive events
 	by introducing binary variables $z_{in} \in \{0, 1\}$ with the following constraints:
 	\begin{alignat}{2}
 		\label{Eq:Binary}
@@ -1087,9 +1087,9 @@ with
 
 \section{Other considerations}
 \paragraph*{Beneficiaries}
-Tax-exempt and tax-deferred accounts have special tax rules that allow giving part
+Tax-free and tax-deferred accounts have special tax rules that allow giving part
 or the entire value of
-tax-exempt accounts to a spouse who can then consider it as his/her own.
+tax-free accounts to a spouse who can then consider it as his/her own.
 These accounts typically use percentages to designate beneficiaries.
 Let $\phi_j$ be the fraction of the account $j$ that a spouse $i_d$ wishes
 to leave to his/her surviving spouse $i_s$

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "owlplanner"
-version = "2025.05.28"
+version = "2025.06.03"
 authors = [
   { name="Martin-D. Lacasse", email="martin.d.lacasse@gmail.com" },
 ]

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/abcapi.py

@@ -16,9 +16,9 @@ solvers for comparison.
 This approach has been successful with the MOSEK and the HiGHS solvers.
 A for matrix, B for bounds, C for constraints. Thus the name ABCAPI.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
 """
 

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/config.py

@@ -4,9 +4,10 @@ Owl/conftoml
 
 This file contains utility functions to save case parameters.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
 """
 
 import toml as toml

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/mylogging.py

@@ -4,9 +4,9 @@ Owl/logging
 
 This file contains routines for handling error messages.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
 """
 

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/plan.py

@@ -8,9 +8,10 @@ A retirement planner using linear programming optimization.
 See companion PDF document for an explanation of the underlying
 mathematical model and a description of all variables and parameters.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
 """
 
 ###########################################################################
@@ -307,7 +308,7 @@ class Plan(object):
         self.kappa_ijn = np.zeros((self.N_i, self.N_j, self.N_n))
 
         # Previous 3 years for Medicare.
-        self.prevMAGI = np.zeros((3))
+        self.prevMAGI = np.zeros((2))
 
         # Init previous balance to none.
         self.beta_ij = None
@@ -498,7 +499,7 @@ class Plan(object):
     def setBeneficiaryFractions(self, phi):
         """
         Set fractions of savings accounts that is left to surviving spouse.
-        Default is [1, 1, 1] for taxable, tax-deferred, adn tax-exempt accounts.
+        Default is [1, 1, 1] for taxable, tax-deferred, and tax-free accounts.
         """
         if len(phi) != self.N_j:
             raise ValueError(f"Fractions must have {self.N_j} entries.")
@@ -901,7 +902,7 @@ class Plan(object):
         try:
             filename, self.timeLists = timelists.read(filename, self.inames, self.horizons, self.mylog)
         except Exception as e:
-            raise Exception(f"Unsuccessful read of contributions: {e}") from e
+            raise Exception(f"Unsuccessful read of Wages and Contributions: {e}") from e
 
         self.timeListsFileName = filename
         self.setContributions()
@@ -909,6 +910,9 @@ class Plan(object):
         return True
 
     def setContributions(self, timeLists=None):
+        """
+        If no argument is given, use the values that have been stored in self.timeLists.
+        """
         if timeLists is not None:
             timelists.check(timeLists, self.inames, self.horizons)
             self.timeLists = timeLists
@@ -1074,8 +1078,6 @@ class Plan(object):
         Utility function that builds constraint matrix and vectors.
         Refactored for clarity and maintainability.
         """
-        self._setup_constraint_shortcuts(options)
-
         self.A = abc.ConstraintMatrix(self.nvars)
         self.B = abc.Bounds(self.nvars, self.nbins)
 
@@ -1098,12 +1100,6 @@ class Plan(object):
 
         return None
 
-    def _setup_constraint_shortcuts(self, options):
-        # Set up all the local variables as attributes for use in helpers.
-        oppCostX = options.get("oppCostX", 0.)
-        self.xnet = 1 - oppCostX / 100.
-        self.optionsUnits = u.getUnits(options.get("units", "k"))
-
     def _add_rmd_inequalities(self):
         for i in range(self.N_i):
             if self.beta_ij[i, 1] > 0:
@@ -1579,14 +1575,18 @@ class Plan(object):
         if objective == "maxSpending" and "bequest" not in myoptions:
             self.mylog.vprint("Using bequest of $1.")
 
-        self.prevMAGI = np.zeros(3)
+        self.optionsUnits = u.getUnits(myoptions.get("units", "k"))
+
+        oppCostX = options.get("oppCostX", 0.)
+        self.xnet = 1 - oppCostX / 100.
+
+        self.prevMAGI = np.zeros(2)
         if "previousMAGIs" in myoptions:
             magi = myoptions["previousMAGIs"]
-            if len(magi) != 3:
-                raise ValueError("previousMAGIs must have 3 values.")
+            if 3 < len(magi) < 2:
+                raise ValueError("previousMAGIs must have 2 values.")
 
-            units = u.getUnits(options.get("units", "k"))
-            self.prevMAGI = units * np.array(magi)
+            self.prevMAGI = self.optionsUnits * np.array(magi)
 
         lambdha = myoptions.get("spendingSlack", 0)
         if lambdha < 0 or lambdha > 50:
@@ -2058,7 +2058,7 @@ class Plan(object):
         dic = {}
         # Results
         dic["Plan name"] = self._name
-        dic["Net yearly spending basis"] = u.d(self.g_n[0] / self.xi_n[0])
+        dic["Net yearly spending basis" + 26*" ."] = u.d(self.g_n[0] / self.xi_n[0])
         dic[f"Net spending for year {now}"] = u.d(self.g_n[0])
         dic[f"Net spending remaining in year {now}"] = u.d(self.g_n[0] * self.yearFracLeft)
 

owlplanner-2025.6.3/src/owlplanner/plotting/__init__.py

@@ -0,0 +1,12 @@
+"""
+Plotting backends for Owl.
+
+Copyright © 2025 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
+"""
+
+from .factory import PlotFactory
+
+__all__ = ['PlotFactory']

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/plotting/base.py

@@ -1,5 +1,10 @@
 """
 Base classes for plot backends.
+
+Copyright © 2025 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
 """
 
 from abc import ABC, abstractmethod

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/plotting/factory.py

@@ -1,5 +1,10 @@
 """
 Factory for creating plot backends.
+
+Copyright © 2025 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
 """
 
 from .base import PlotBackend

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/plotting/matplotlib_backend.py

@@ -1,5 +1,10 @@
 """
 Matplotlib implementation of plot backend.
+
+Copyright © 2025 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
 """
 
 import numpy as np
@@ -372,17 +377,19 @@ class MatplotlibBackend(PlotBackend):
             raise ValueError(f"Unknown coordination {ARCoord}.")
         figures = []
         assetDic = {"stocks": 0, "C bonds": 1, "T notes": 2, "common": 3}
+        blank = ["", ""]
         for i in range(count):
             y2stack = {}
             for acType in acList:
                 stackNames = []
                 for key in assetDic:
-                    aname = key + " / " + acType
+                    # aname = key + " / " + acType
+                    aname = key
                     stackNames.append(aname)
                     y2stack[aname] = np.zeros((count, len(year_n)))
                     y2stack[aname][i][:] = alpha_ijkn[i, acList.index(acType), assetDic[key], : len(year_n)]
-                t = title + f" - {acType}"
-                fig, ax = self._stack_plot(year_n, inames, t, [i], y2stack, stackNames, "upper left", "percent")
+                t = title + f" - {acType} {inames[i]}"
+                fig, ax = self._stack_plot(year_n, blank, t, [i], y2stack, stackNames, "upper left", "percent")
                 figures.append(fig)
 
         return figures

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/plotting/plotly_backend.py

@@ -1,5 +1,10 @@
 """
 Plotly implementation of plot backend.
+
+Copyright © 2025 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
 """
 
 import numpy as np
@@ -815,7 +820,8 @@ class PlotlyBackend(PlotBackend):
                 stack_data = []
                 stack_names = []
                 for key in assetDic:
-                    aname = f"{key} / {acType}"
+                    # aname = f"{key} / {acType}"
+                    aname = key
                     stack_names.append(aname)
 
                     # Get allocation data
@@ -834,7 +840,7 @@ class PlotlyBackend(PlotBackend):
                     ))
 
                 # Update layout
-                plot_title = f"{title} - {acType}"
+                plot_title = f"{title} - {acType} {inames[i]}"
                 fig.update_layout(
                     title=plot_title,
                     # xaxis_title="year",

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/progress.py

@@ -1,6 +1,10 @@
 """
 A simple object to display progress.
 
+Copyright © 2024 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
+
 """
 
 from owlplanner import utils as u

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/rates.py

@@ -21,11 +21,10 @@ Rate lists will need to be updated with values for current year.
 When doing so, the TO bound defined below will need to be adjusted
 to the last current data year.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
 
-Last updated: Jan 2025
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
 """
 
 ###################################################################

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/tax2025.py

@@ -10,9 +10,10 @@ of all variables and parameters.
 
 Module to handle all tax calculations.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
 """
 
 import numpy as np
@@ -93,9 +94,9 @@ def mediCosts(yobs, horizons, magi, prevmagi, gamma_n, Nn):
         status = 0 if Ni == 1 else 1 if n < horizons[0] and n < horizons[1] else 0
         for i in range(Ni):
             if thisyear + n - yobs[i] >= 65 and n < horizons[i]:
-                # Start with the (indexed) basic Medicare part B premium.
+                # Start with the (inflation-adjusted) basic Medicare part B premium.
                 costs[n] += gamma_n[n] * irmaaFees[0]
-                if n < 3:
+                if n < 2:
                     mymagi = prevmagi[n]
                 else:
                     mymagi = magi[n - 2]

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/timelists.py

@@ -10,9 +10,10 @@ of all variables and parameters.
 
 Utility functions to read and check timelists.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
+
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
 """
 
 from datetime import date
@@ -47,7 +48,7 @@ def read(finput, inames, horizons, mylog):
     mylog.vprint("Reading wages, contributions, conversions, and big-ticket items over time...")
 
     if isinstance(finput, dict):
-        timeLists = finput
+        dfDict = finput
         finput = "dictionary of DataFrames"
         streamName = "dictionary of DataFrames"
     else:
@@ -58,7 +59,7 @@ def read(finput, inames, horizons, mylog):
             raise Exception(f"Could not read file {finput}: {e}.") from e
         streamName = f"file '{finput}'"
 
-        timeLists = condition(dfDict, inames, horizons, mylog)
+    timeLists = condition(dfDict, inames, horizons, mylog)
 
     mylog.vprint(f"Successfully read time horizons from {streamName}.")
 

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/src/owlplanner/utils.py

@@ -4,9 +4,9 @@ Owl/utils
 
 This file contains functions for handling data.
 
-Copyright (C) 2024 -- Martin-D. Lacasse
+Copyright © 2024 - Martin-D. Lacasse
 
-Disclaimer: This program comes with no guarantee. Use at your own risk.
+Disclaimers: This code is for educatonal purposes only and does not constitute financial advice.
 
 """
 

owlplanner-2025.6.3/src/owlplanner/version.py

@@ -0,0 +1 @@
+__version__ = "2025.06.03"

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/tests/test_regressions.py

@@ -67,11 +67,10 @@ def test_date_1():
     assert np.array_equal(p.expectancy, expectancy)
     assert p.N_i == 2
     assert p._name == name
-    assert p.startDate == None
+    assert p.startDate is None
 
 
 def test_date_2():
-    thisyear = date.today().year
     n = 10
     p = createPlan(1, 'date_2', n, 70)
     amount = 3.0

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/ui/About_Owl.py

@@ -4,7 +4,7 @@ import sskeys as kz
 import owlbridge as owb
 
 
-st.write("# About Owl 🦉")
+st.write("# :material/info: About Owl 🦉")
 kz.divider("orange")
 
 st.write(f"This is Owl version {owb.version()} running on Streamlit {st.__version__}.")
@@ -56,6 +56,7 @@ own data to your computer before closing the session.
 [Gnu General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html#license-text).
 
 #### :orange[Disclaimer]
-- This program is provided for educational purposes and comes with no guarantee. Use at your own risk.
+This program is for educatonal purposes only and does not constitute financial advice.
+
 """
 )

{owlplanner-2025.5.28 → owlplanner-2025.6.3}/ui/Asset_Allocation.py

@@ -24,9 +24,8 @@ ASSET = ["S&P 500", "Corp Bonds Baa", "T-Notes", "Cash Assets"]
 DEFALLOC = [60, 20, 10, 10]
 
 
-def getIndividualAllocs(i, title, deco):
+def getIndividualAllocs(i, iname, title, deco):
     mydeco = "j3_" + deco
-    iname = kz.getKey("iname" + str(i))
     st.write(f"###### {iname}'s {title} allocation for all accounts (%)")
     cols = st.columns(4, gap="large", vertical_alignment="top")
     for k1 in range(4):
@@ -35,8 +34,7 @@ def getIndividualAllocs(i, title, deco):
     checkIndividualAllocs(i, mydeco)
 
 
-def getAccountAllocs(i, j, title, deco):
-    iname = kz.getKey("iname" + str(i))
+def getAccountAllocs(i, iname, j, title, deco):
     mydeco = f"j{j}_" + deco
     st.write(f"###### {iname}'s {title} allocation for {ACC[j]} account (%)")
     cols = st.columns(4, gap="large", vertical_alignment="top")
@@ -81,38 +79,47 @@ def checkAllAllocs():
     return result
 
 
-ret = kz.titleBar("Asset Allocation")
+ret = kz.titleBar(":material/percent: Asset Allocation")
 
 if ret is None or kz.caseHasNoPlan():
     st.info("Case(s) must be first created before running this page.")
 else:
+    st.write("#### :orange[Type of Allocation]")
     choices = ["individual", "account"]
     key = "allocType"
     kz.initKey(key, choices[0])
     helpmsg = "Allocation ratios can be equal across all accounts or not."
     ret = kz.getRadio("Asset allocation method", choices, key, help=helpmsg)
+    st.divider()
     if ret == "individual":
+        iname0 = kz.getKey("iname0")
+        st.write(f"#### :orange[Individual Asset Allocation ({iname0})]")
+        getIndividualAllocs(0, iname0, "initial", "init%")
+        getIndividualAllocs(0, iname0, "final", "fin%")
         st.divider()
-        getIndividualAllocs(0, "initial", "init%")
-        getIndividualAllocs(0, "final", "fin%")
 
         if kz.getKey("status") == "married":
+            iname1 = kz.getKey("iname1")
+            st.write(f"#### :orange[Individual Asset Allocation ({iname1})]")
+            getIndividualAllocs(1, iname1, "initial", "init%")
+            getIndividualAllocs(1, iname1, "final", "fin%")
             st.divider()
-            getIndividualAllocs(1, "initial", "init%")
-            getIndividualAllocs(1, "final", "fin%")
     else:
+        iname0 = kz.getKey("iname0")
+        st.write(f"#### :orange[Account Asset Allocation ({iname0})]")
         for j in range(3):
+            getAccountAllocs(0, iname0, j, "initial", "init%")
+            getAccountAllocs(0, iname0, j, "final", "fin%")
             st.divider()
-            getAccountAllocs(0, j, "initial", "init%")
-            getAccountAllocs(0, j, "final", "fin%")
         if kz.getKey("status") == "married":
-            st.markdown("###")
+            iname1 = kz.getKey("iname1")
+            st.write(f"#### :orange[Account Asset Allocation ({iname1})]")
             for j in range(3):
+                getAccountAllocs(1, iname1, j, "initial", "init%")
+                getAccountAllocs(1, iname1, j, "final", "fin%")
                 st.divider()
-                getAccountAllocs(1, j, "initial", "init%")
-                getAccountAllocs(1, j, "final", "fin%")
 
-    st.divider()
+    st.write("#### :orange[Interpolation]")
     choices = ["linear", "s-curve"]
     key = "interpMethod"
     kz.initKey(key, choices[0])