still working on homePage rework