Refactor text-drawing routine
Add display toggle based on object type.