cleaned up navigation