fixing up navigation