Add city row and refactor.