Change positioning of elements in the navbar

references #38
Fix html indent in navbar
Merge branch 'navbar'