Fixed helpers, nav-primary template, small tweaks