navbar changes
Merge pull request #162 from benitoro/master

navbar changes