Many changes, trying to generalize for display formats.
Many changes, trying to generalize for display formats.

cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw,cjungmann/schemafw