HomePage fixes