is there a way to organize your servers In Windows Admin Center?

Been playing around with Windows Admin Center, but can't help the feeling that the product is immature. We manage a large server farm with over 500 servers, and there seems to be no way to organize them in to logical units.

The other issue I faced, is that I cannot remove servers which have been demoted. The Remove option is greyed out.