Restructure controller code to get/set amortization form values, calendar input tweaking