Change positioning of elements in the navbar

references #38