Update display code to handle multiple display types

[benabernathy]

Update the display code to handle multiple display types of varying geometries.