fixed header menu to use bootstrap
fix merge
fix the menu