fixup navigation