Cleaned up navigation.