Modify layout and format definitions.
Update tests for new components.