Getting units and cities to display coexist more happily in the interface