replaced legend, nav tweaks