Allow dashes and hyphens in container and include names
Change view instantiation to use #from_doc