adjusted nav bar and search
Merge branch 'master' into jake