[CLC-2560] MyFinAid follow up tasks
Merge pull request #1591 from yuhunglin/CLC-2560

[CLC-2560] Follow up work for MyFinAid