Final nav tweak