Fixed the NavBar to be horizontal.
Merge origin/master