refactor navbar-masthead to be like BS3
rename navbar-search to navbar-form