8663019 Fix several issues with homepage