changed search/nav bar stuff
fixed merge conflicts