[REFACTOR] Tidy up UI on homepage