Pimped navbar

Redesign of navbar to acommodate more controls.