Further tweaks to navi's setup