Keep working on homepage and search