Prepare for Multiple display types.

Refactor layout of Display and Render relationship.