Feature/homepage bugfixes

[VaibhavSasulkar]

Please always provide the GitHub issue(s) your PR is for, as well as test URLs where your change can be observed (before and after):

Fix #

Test URLs:

• Before: https://main--{repo}--{owner}.hlx.live/
• After: https://--{repo}--{owner}.hlx.live/