Fix minor bugs.
Merge branch 'add-info-home' into develop