Home Page fixes