Navbranch

@ssaunier @neocanada 

fix navbar issues