The City Club renovation marries old with new