WIP. Some refactor.  Enhance layout to deal with nested tuples & lists.  More complex test pages.