More clean up of home page