new navbar
fixed navbar conflict
Merge pull request #1 from Thibou/navbar_design

new navbar fixed conflict