Minor fixes on nav bar