navbar reorganize, other minor tweaks