NavBar Height cleanup credit: finnq