add header logic for the home page
merge conflits