more navbar reorganization