Improved generic-display.
Improved generic-editing.
Improved generic-display and generic-editing templates.