Working on homePage (cont)