TASKMAN-34: Improve display on tablet