Work on home page & not found logic