UCJEPS-502: reorganizing Full display a bit to conform better to spec.