another round of nav tweaks