Some tweaking for navbar