Trump's national security team taking shape