Search and nav tweaks