Feature: two rows of yields in city screen

Most of the code is copied from RaR