Cleaned up navigation, funding index