fixed up unmerged changes related to nav and adding in searching html page