Make modifications suggested by rkcripps so the guide gride looks good when
there are less than 9 channels listed.

(cherry picked from commit bd41bdbc2570965aef72119f5fc06c741b60e365)