Fixed Comments on nav_config; Clean up