Cleaned up navigation