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

(cherry picked from commit 25b10a657802f6a9bd2343ff084bd8c08ffe1ebf)