Cleanup of container widgets and code for LazyDocumentWrapper