Further Navbar code cleanup.

Working towards and slowly integrating a new Navbar driver designed for
extendability and ease of use.