moar tweaks to nav patterns