Edit/Fulfill Goals from Calendar View

When in the calendar, it would be nice to be able to select a goal from a certain day, edit or fulfill the goal amount, and still remain on the calendar day once the category window closes.

I love ZS for the calendar feature and budget based on it specifically. But currently, while in the calendar view, if I select a goal, fill it from the category pop up, and close, I am redirected to the home budget screen, not the calendar, nor the day that I was budgeting for.

Because of this, I have to keep going back to the calendar, the day, and filling the goal every time I want to budget for one category.

Hopefully this makes sense!