more navbar reorg/cleanup
more navbar reorg/cleanup