fixed up navigation