Modify navbar buttons
Merge branch 'master' of https://github.com/styhihs/ccsp-project
Modify navbar: add search bar