Trump picks attorney general and U.N. envoy in fresh staff shake-up