removed 'city' from the name of cities in the City screen