Small change to the logic of the final screen drawing