Using navbar, and improving help popover.