Minor improvements for the UserAnnualPlan MVC