fixed navigation for realz this time