Content, nav tweaks