fix up navigation