Cleaned up navigation structure