Fixes on homepage invest box

It closes #540 and closes #638.