Rework on home page